profiles
Merge branch 'develop' of https://github.com/42Zavattas/intra into develop

Conflicts:
	app/scripts/app.js
	app/scripts/controllers/profile.js
	app/views/index.html
	app/views/partials/nav.html
	app/views/partials/profile.html
	app/views/partials/users.html
	test/client/spec/controllers/profile.js
	test/client/spec/controllers/users.js