working on stories
Merge branch 'dev' of github.com:jarkelen/kanban-fest into dev

Conflicts:
	client/templates/projects/project_board.js
	client/templates/projects/projects_list.html