Modif nico
Merge branch 'mednic' of git@github.com:eclar/mines-travel.git into
mednic

Conflicts:
	src/main/webapp/WEB-INF/views/hotels/list.jsp
Debug List quand on a pas de critères de recherches
Merge branch 'fixLogin'
Merge branch 'master' of https://github.com/eclar/mines-travel