commit merge
Merge branch 'dev_david'

Conflicts:
	res/layout/activity_accueil_listview.xml
	src/metier/PromenadeAdapter.java
Merge branch 'dev_david'
merge
commit