sfsfdsfds
fsf
Merge branch 'dev'

Conflicts:
	hybridapp/www/js/controller.js
fdsfsdfds
Merge branch 'dev'
delete server part