table-plan
priorization
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/css/app.scss
	app/table-plan/table-plan.html
formatting etc