validated json file
Changed Makefile to compile MapEdit with own target
Merge branch 'develop' of https://github.com/borlox/Drachen into develop

Conflicts:
	data/themes/default/theme.js