..
Merge branch 'master' of https://github.com/Comodato/ComodatoGLOBAL

Conflicts:
	README.md
	data/monster/bosses/mad mage.xml
	data/monster/bosses/raging mage.xml
	data/monster/missing.txt
	data/movements/scripts/formorgar mines hoist/formorgarMinesHoist.lua
	data/movements/scripts/meriana/merianaTurtles.lua
	data/npc/scripts/Marina.lua