commit new branch
Merge branch 'master' of https://github.com/CarrDavidDC/tpPromenades.git

Conflicts:
	src/bdd/DatabaseHandler.java
	src/com/example/tppromenades/MainActivity.java
	src/reglage/ReglageSingleton.java