activity for iga !
Merge remote-tracking branch 'origin/master' into lacsap-epicerie

Conflicts:
	app/src/main/java/com/d2maps/epicerieapp/Epicerie.java