more logo
Merge remote-tracking branch 'origin/ralph/develop' into greg/develop

Conflicts:
	ui/app/styles/main.less
job events
Merge remote-tracking branch 'origin/greg/develop' into ralph/develop
done?