0.5.10
Merge branch 'master' of http://github.com/punkave/apostrophe-map

Conflicts:
	package.json