fixes for map distortion
Merge branch 'master' into Localist

Conflicts:
	themes/afterclass2/css/master.css
	themes/afterclass2/css/master.css.map