unfinished fix
Something works.
Merge branch 'master' into add-card-and-board-styling

Conflicts:
	app/scripts/services/contentfactory.js
	app/views/partials/card.html
	app/views/partials/main.html