refactored a bunch of css, added style sheet for map
Merge commit '94d20615dd5fb01bd62adb29cc8721edae6d4dc7'

Conflicts:
	src/main/webapp/styles/james.css
	src/main/webapp/views/preferences.html