Various improvements
Merge branch 'master' into develop
Improve debugging and colours
Merge branch 'develop'

Conflicts:
	app/styles/partials/_type.scss
	app/styles/vars/_structure.scss