changes
Merge branch 'master' of https://github.com/guymorita/squirrel into contacts
changes for friend flow
Merge branch 'master' of https://github.com/guymorita/squirrel into contacts

Conflicts:
	www/js/controllers.js
	www/js/services.js
	www/partials/newMessageView.html
all changes to icons, creation flow, friend flow