merging test/
Merge branch 'master' of https://github.com/mcheung63/titan-server

Conflicts:
	test/hibernate.cfg.xml
	test/log4j.properties
	test/titan-server.log
	test/titan-server.xml