28.11
AbstractCity
Merge branch 'master' of https://github.com/SnoopInf/zhekatutoring

Conflicts:
	SevenWonders/src/com/sevenwonders/server/repository/XMLCardFactory.java
	SevenWonders/src/com/sevenwonders/server/service/Table.java