adding smack
Modifying colors
Merge branch 'master' of https://github.com/radiantbluetechnologies/omar

Conflicts:
	plugins/omar-federation/grails-app/conf/BuildConfig.groovy
	plugins/omar-federation/web-app/css/rasterSearch.css