Merge branch 'redesign' into develop

Conflicts:
	apps_template/global.css
Resolve global stylesheet conflict