Fiexed controller issue
Merge branch 'hot_fix' into dev
camelCase for properties
Merge branch 'dev'