use colors from mock-up
Merge remote-tracking branch 'origin/master' into 58354376-make-colors-better

Conflicts:
	styles/variables.less
	styles/workspace/sidebar.less
Merge pull request #54 from oerpub/58354376-make-colors-better

use colors from mock-up