Styling profile page
Merge branch 'master' of https://github.com/Hackstore/hackstore

Conflicts:
	hackstore/server/permissions.js
Merge branch 'master' of https://github.com/Hackstore/hackstore