test marker comments.
Merge branch 'master' of https://github.com/coyotebringsfire/hatch
Merge branch 'master' of https://github.com/coyotebringsfire/hatch

Conflicts:
	Resources/ui/common/NewPOIView.js