Conflit
Modificaiton
Enfoiré
Merge branch 'master' of https://github.com/CDIISICRM/AndroMagG2

Conflicts:
	AndroMagG2/bin/AndroMag.apk
	AndroMagG2/bin/classes.dex
	AndroMagG2/bin/classes/.gitignore
	AndroMagG2/bin/classes/dbAccess/DBAdapter.class
	AndroMagG2/bin/classes/fr/cdig2/androMag/controller/MagazineActivity.class
	AndroMagG2/bin/classes/fr/cdig2/androMag/controller/R$id.class
	AndroMagG2/bin/classes/fr/cdig2/androMag/controller/R$layout.class
	AndroMagG2/bin/classes/fr/cdig2/androMag/controller/R$menu.class
	AndroMagG2/bin/classes/fr/cdig2/androMag/controller/R$string.class
	AndroMagG2/bin/resources.ap_
	AndroMagG2/res/layout/item_list_view.xml
	AndroMagG2/src/fr/cdig2/androMag/controller/MagazineActivity.java