Minor corrections
Merge branch 'master' of github.com:atomicity/kaca.la

Conflicts:
	templates/showroom.html.twig