Merge origin/master

Conflicts:
	Resources/Maps/Level1.txt
Merge origin/master

Conflicts:
	Resources/Maps/Level1.txt