Fixed stuff
Merge branch 'master' of https://github.com/Geopollinator/Geopollinator

Conflicts:
	rapscript.js