profile
Merge branch 'master' of https://github.com/svenne87/betbattle

Conflicts:
	app/controllers/profile.js