Merge branch 'develop'
Merge branch 'develop'
Change to blue theme colors.
Merge branch 'master' into develop

Conflicts:
	css/global.css