screen style demarcation
Merge branch 'develop' of https://github.com/neontribe/DocReady into develop

Conflicts:
	app/styles/main.less