Merge branch 'develop'

Conflicts:
	res/Tilesets/zones.png
	res/battery.png
	res/cursor.png
	res/fonts/COPYING.txt
	res/fonts/COVERAGE.txt
	res/fonts/CREDITS.txt
	res/fonts/README.txt
	res/fonts/Xolonium-Bold.otf
	res/fonts/xolonium.png
	res/fonts/xolonium_regular.otf
	saves/2.sav