add four api
Merge branch 'master' of https://github.com/itravel/server.git

Conflicts:
	server/dal/src/main/java/META-INF/persistence.xml
	server/dal/src/main/resources/META-INF/persistence.xml