wip
Merge branch 'develop' into design/desktop

Conflicts:
	static/www/css/desktop.css
added Layout stuff
minor layout mods
Merge branch 'develop' into design/desktop
wip
wip
bug fixes
Merge branch 'design/desktop' into staging
dist