Small front-end fixes
Merge branch 'master' of https://github.com/NoviumDesign/Eventmarket

Conflicts:
	public/css/app.css