#6 refactoring
Merge branch 'master' of github.com:oumarPoulo/PaulSabatier_Trip

Conflicts:
	web/WEB-INF/jsp/index.jsp
	web/WEB-INF/jsp/velib.jsp