[Cyntain] Organisation of the classes into resources and common 2
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	tt_common/mapGen/BasicTileMapper.java
	tt_common/mapGen/BasicTileMapper2.java
	tt_common/mapGen/Tile.java
	tt_common/mapGen/TileMapper.java