thirst
commit change
15/10/2013
18/10
25/10
Merge branch 'master' of https://github.com/ngochivinh/TourProject.git

Conflicts:
	src/main/java/com/software/tour/domain/User.java
	src/main/java/com/software/tour/service/UserService.java
	src/main/java/com/software/tour/service/jpa/UserServiceImpl.java
	src/main/resources/datasource-tx-jpa.xml