! refactoring and changes for MapView Plugin
Merge branch 'master' of https://github.com/dpoellath/okinoby

Conflicts:
	www/index.html