add more prep work for info interface
Merge branch 'bb'

Conflicts:
	AncientWarfare/src/shadowmage/ancient_warfare/common/network/GUIHandler.java