Merge with upstream
Stefan's logo.
Icons instead of text for navigation
PNG logo.
Fix icon font path
Upload page fixes
Compile base.less
Merge remote-tracking branch 'origin/master' into ui-fixes

Conflicts:
	host/supervisord.conf
Merge pull request #48 from shashi/ui-fixes

Ui fixes