Merge origin/master

Conflicts:
	src/Resources/map.data
Merge origin/master

Conflicts:
	src/Resources/map.data
Merge origin/master
Merge origin/master

Conflicts:
	src/Resources/map.data
Merge origin/master

Conflicts:
	src/Resources/map.data