fsdf
fsdf
Merge branch 'dev'

Conflicts:
	backendmanager/www/js/manager.js
fsdf
fdsfs
sfdjdskfjlsdjfks
Merge branch 'dev'

Conflicts:
	backendmanager/www/index.html
ffffffffffffff
Merge branch 'dev'

Conflicts:
	hybridapp/www/js/controller.js
fff
fff
fff
fff
Merge branch 'dev'
ffff
ff
Merge branch 'dev'