fixes for emma, general clean-up and styling.
Merge branch 'master' of https://github.com/AmericanRedCross/presentations

Conflicts:
	introGIS/css/theme/redcross.css