adding cado traing arena main floor
Cado training room tweaks
Training room work
cado training room roof
Merge branch 'develop' of https://github.com/LaFamiglia/Illarion-Map into develop

Conflicts:
	Cadomyr/Roofs_and_mountains_1.items.txt
	Cadomyr/Roofs_and_mountains_1.tiles.txt
	Cadomyr/Roofs_and_mountains_1.warps.txt