Merge pull request #1 from Geodan/master

merge from origin
something
Merge pull request #2 from Geodan/master

merge from origin
Merge branch 'master' of https://github.com/tomvantilburg/d3.mappu

Conflicts:
	src/map/d3.mappu.Map.js
First passing test
Merge pull request #5 from tomvantilburg/master

merge from Tom