edition gitignore
Merge branch 'dev' of imierennes.no-ip.biz:cdpnr02-2014/projet-imie into kmahe

Conflicts:
	.gitignore
Test
Merge branch 'jeremy' of imierennes.no-ip.biz:cdpnr02-2014/projet-imie into jeremy
this is sparta
Modifs tests
Merge branch 'dev' into jeremy
Mise en place du menu ( toujours en cours )
Merge branch 'dev' into jeremy

Conflicts:
	AndroidManifest.xml
	src/com/imie/rennes/activity/AccueilEleveActivity.java
Modifs classes pour début de mise en place du menu
Merge branch 'dev' into jeremy

Conflicts:
	AndroidManifest.xml
	src/com/imie/rennes/activity/LoginActivity.java
	src/com/imie/rennes/imienetwork/LoginActivity.java
	src/com/imie/rennes/mainActivity/LoginActivity.java
	src/com/imie/rennes/mainActivity/MainActivity.java
Merge branch 'dev' into jeremy
azert
Modifs MainActivity, ajout du menu
Suppresion android-support-v4.jar
Merge branch 'dev' into kmahe

Conflicts:
	src/com/imie/rennes/classes/Eleve.java
Mise en place action bar
choucroute
Merge branch 'jeremy' of 10.0.7.8:cdpnr02-2014/projet-imie into jeremy

Conflicts:
	.classpath
	res/values/strings.xml
	src/com/imie/rennes/activity/DeposerOffreActivity.java
	src/com/imie/rennes/activity/EnvoiMessageActivity.java
	src/com/imie/rennes/activity/EvenementEnqueteActivity.java
	src/com/imie/rennes/activity/MessagerieActivity.java
	src/com/imie/rennes/activity/OffreActivity.java
	src/com/imie/rennes/activity/VisualiserCvActivity.java
	src/com/imie/rennes/activity/VisualiserMessageActivity.java
	src/com/imie/rennes/classes/ListMenuItemAdapter.java
	src/com/imie/rennes/mainActivity/MainActivity.java
Modifs activity