+
Merge branch 'master' of https://github.com/Kukambara/worldofzaar

Conflicts:
	target/WorldOfZaar/WEB-INF/classes/com/worldofzaar/service/CertainTableService.class
	target/classes/com/worldofzaar/service/CertainTableService.class