closes issue #630
closes issue #630
fix whitespaces and line breaks
simplify, fix whitespaces and line breaks
Reverting to previous version

My advice to attach the events instance to the map div was a bad one.
Unregister events properly
Merge branch 'swen100:master', with two additional minor fixes

Fixes #1013