added a profile page
pagination
Fix conflict in gitignore
Merge pull request #4 from callicles/pagination

Pagination
Merge remote-tracking branch 'origin/master' into profile-page
a slight change
fix cancel
added a login counter when logged in as user
Merge pull request #5 from callicles/fistule

fix cancel
Merge pull request #7 from callicles/success-failure-count

Success failure count, confirm
fix login size #8
Merge pull request #8 from callicles/fistule

fix login size #8
users list displayed
deleted useless class searchUserCriteria
Implemented insertion of new users into the database

the login is still not linked to the database so new users are nonexistent for now
Merge remote-tracking branch 'origin/feature12' into feature5bis

Conflicts:
	src/main/java/org/springframework/samples/travel/application/UserService.java
	src/main/java/org/springframework/samples/travel/interfaces/web/controller/UserController.java
	src/main/resources/META-INF/spring/servlet/controllers.xml