Adding categories as labels, dropping placeholder html elements.
Merge branch 'master' of https://github.com/pauleous/vote

Conflicts:
	app/styles/main.scss