class path update
Merge branch 'master' of https://github.com/Adrien10/MonTpPorte into Quentin
Merge branch 'master' of https://github.com/Adrien10/MonTpPorte into Quentin

Conflicts:
	src/com/imie/montpporte/GestionDonneesActivity.java