view changes
change styles
merge with live
correct the mistakes
Merge branch 'feature' of git://github.com/Natalia21/mobile-angular-ui into Natalia21-feature

Conflicts:
	src/js/config/routes.js