add mapcrafter, update README
Merge branch 'master' into develop

Conflicts:
	requirements.txt