16/04/2014
test
Merge branch 'master' of
https://github.com/2slamppe-eq7/gestageandroid.git

Conflicts:
	bin/classes/com/grp6/gestage/fonction/StageF.class
	bin/classes/com/grp6/gestage/fragment/StageFragment$getAnnees.class
	bin/classes/com/grp6/gestage/fragment/StageFragment$getClasses.class
	src/com/grp6/gestage/fonction/StageF.java