Code Cleanup
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	stylesheet.less