- added license info
Merge branch 'master' into halsafar-requiredArgs

Conflicts:
	src/tmxparser.cpp