FI from dev1 into release#124

Merged

dragonfly91 merged 2 commits intoreleasefrom

Aug 19, 2015

Commits on Aug 19, 2015

Fixing enum value of Type.
AditTulasi
committed
Merge branch 'release' into dev1
dragonfly91
committed