css refactor and cleanup
Merge branch 'devel' into feature/task-templates

Conflicts:
	client/app/styles/_cliche.scss
	client/app/styles/main.scss
	client/app/views/app/tool.html
	client/app/views/app/workflow-view.html
	client/app/views/task.html
css refactor and cleanup