Styling to profile
Merge remote-tracking branch 'origin/master' into user-profile

Conflicts:
	static/css/style.css
Removed merged login styling (breaking buttons)
Merge remote-tracking branch 'origin/master' into design