Merge branch 'master' of https://github.com/kennstenicht/persequi

Conflicts:
	app/components/item-card.coffee