Dernieres midifications
suppression de l'ancien projet
suppression
Merge branch 'master' of https://github.com/bonguet/coloc

Conflicts:
	adroommates-server-side/app/models/Member.java
	adroommates-server-side/conf/application.conf
	adroommates-server-side/conf/evolutions/default/1.sql
	adroommates-server-side/conf/routes
	androommates-client-side/.classpath
	androommates-client-side/AndroidManifest.xml
	androommates-client-side/project.properties
	androommates-client-side/res/layout/activity_main.xml
	androommates-client-side/res/values/strings.xml
	androommates-client-side/src/poly/androommates/controllers/NetworkComManager.java
	androommates-client-side/src/poly/androommates/models/Member.java
	androommates-client-side/src/poly/androommates/views/FinanceActivity.java
	androommates-client-side/src/poly/androommates/views/InboxActivity.java
	androommates-client-side/src/poly/androommates/views/LoginActivity.java
	androommates-client-side/src/poly/androommates/views/MainActivity.java
	androommates-client-side/src/poly/androommates/views/NewPurchaseActivity.java
	androommates-client-side/src/poly/androommates/views/RegistrationActivity.java
	androommates-client-side/src/poly/androommates/views/ShoppingListActivity.java
	androommates-client-side/src/poly/androommates/views/SplashScreenActivity.java