[DEV] gestion mode offline
Merge branch 'master' of https://github.com/lemfi/PJMaintenant

Conflicts:
	src/fr/pjdroidteam/pjmaintenant/activites/carte/CarteActivity.java
	src/fr/pjdroidteam/pjmaintenant/pros/controller/ProsController.java
	src/fr/pjdroidteam/pjmaintenant/pros/controller/impl/ProsControllerImpl.java
	src/fr/pjdroidteam/pjmaintenant/pros/factory/impl/ProFactoryImpl.java
[DEV] gestion du offline
Merge branch 'master' of https://github.com/lemfi/PJMaintenant

Conflicts:
	src/fr/pjdroidteam/pjmaintenant/activites/carte/CarteActivity.java
	src/fr/pjdroidteam/pjmaintenant/pros/controller/ProsController.java
	src/fr/pjdroidteam/pjmaintenant/pros/controller/impl/ProsControllerImpl.java
[DEV] gestion offline