Merge branch 'master' of github.com:chrizzTs/Who-U

Conflicts:
	app/scripts/controllers.js
	package.json
merge Vincent