Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Fix Angurlar Controller problem
Merge branch 'dev'

Conflicts:
	core/client/app/js/app.js
Fix merge problem
Merge branch 'master' into dev