.
Merge branch 'master' of github.com:KaterMikesch/phytomap

Conflicts:
	resources/public/js/phytomap.js