Styling
Merge branch 'master' of github.com:esphen/fooz

Conflicts:
	client/app/styles/commons.scss
Merge branch 'master' of github.com:esphen/fooz

Conflicts:
	client/app/views/user/profile.html