c
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/MainActivity.apk
	bin/classes.dex
	bin/classes/univ/amu/applicationfamille/AgendaFragment.class
	bin/classes/univ/amu/applicationfamille/ListeCourseFragment.class
	bin/classes/univ/amu/applicationfamille/LoginActivity.class
	bin/classes/univ/amu/applicationfamille/R$id.class
	bin/classes/univ/amu/applicationfamille/R$layout.class
	bin/classes/univ/amu/applicationfamille/R$menu.class
	bin/classes/univ/amu/applicationfamille/R$string.class
	bin/classes/univ/amu/applicationfamille/R$style.class
	bin/resources.ap_
	gen/univ/amu/applicationfamille/R.java

c