my_commit
Merge branch 'master' of ssh://opendungeons.git.sourceforge.net/gitroot/opendungeons/opendungeons

Conflicts:
	levels_git/Test.level
	ogre.cfg
Merge branch 'development'
Renumbered tile types in Tile.h and made the appropriate changes to the test level and Tile.cpp.
Revert "Renumbered tile types in Tile.h and made the appropriate changes to the test level and Tile.cpp."

This reverts commit 139a79bd9b793ba503e30ad3487ed702bbabbf9d.

Removeing commit that should have gone into the dev branch.
Merge branch 'development' of ssh://git.code.sf.net/p/opendungeons/git
Merge branch 'development' of ssh://git.code.sf.net/p/opendungeons/git
Merge branch 'development' of ssh://git.code.sf.net/p/opendungeons/git
Merge branch 'development' of ssh://git.code.sf.net/p/opendungeons/git
Fixed the OverlaySystem : Benchmark info display correctly
Restored in-game Console -- showing again on tilde
Updated FAQ file
Added the Seat XML schemes
Changed directory structure of XML ; RoomListSchema.xsd added
Changed directory structure of XML ; RoomListSchema.xsd added 2
Fixed Seat* XML files
Merge branch 'development' of ssh://git.code.sf.net/p/opendungeons/git
Updating FindORE.cmake, updating  XML/xsd files
Merge branch 'development' of ssh://git.code.sf.net/p/opendungeons/git
 removed platform check in ResourceManager.cpp when choosing plugin.cfg