Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/DB/ClassPalTable.js
	src/DB/ClassTable.js
	src/DB/Items/HatTable.js
	src/DB/PetInfo.js
	src/Engine/LoginEngine.js
	src/Renderer/Effects/Damage.js
	src/Renderer/Effects/Sky.js
	src/Renderer/Map/Altitude.js
	src/Renderer/Map/GridSelector.js
	src/Renderer/Map/Ground.js
	src/Renderer/Map/Water.js