re #722 - Updated logo and fixed some issues after merging with master
re #722 - Re-use assets from other theme
Merge branch 'master' into feature/722-splash

Conflicts:
	application/manager/component/streets/view/municipalities/templates/default.html.php
	application/site/public/theme/portal/templates/application/page/default.html.php
	component/streets/model/municipalities.php
re #722 - Major improvements to the splash page
Merge branch 'feature/722-splash' into staging