put controls back on map
Merge branch 'master' into development_e