.classpath deleted online with Bitbucket
Merge branch 'master' of https://bitbucket.org/guymoyo/nomade
Merge branch 'master' of https://bitbucket.org/guymoyo/nomade
Merge branch 'master' into develop

Conflicts:
	.project
	.settings/org.eclipse.ajdt.core.prefs
	log.roo
	src/main/java/com/nomade/domain/BeanHistorique.java
	src/main/java/com/nomade/web/HomeController.java
	src/main/webapp/WEB-INF/i18n/application.properties
	src/main/webapp/WEB-INF/views/etapevoyages/create.jspx
	src/main/webapp/WEB-INF/views/public/nomadeTile.jspx
mongo.host
Merge branch 'develop' of https://bitbucket.org/guymoyo/nomade into develop
purpose of the travel
nomadeTile.jspx edited online with Bitbucket
.
historik pr chak user, contact mozaique et clickable
remove subdanger and info
fix
fix nomade bug
trad nomadFooterTitle.jspx
trad friendsTitle.jspx
application_fr.properties edited online with Bitbucket
Merge branch 'master' into develop

Conflicts:
	log.roo
	src/main/webapp/WEB-INF/views/public/nomadeTile.jspx
fix internationalization
fix some violation insecure
.