Layout Choice
Inscription User
Merge branch 'EventOrga' of https://github.com/tipsyproject/android

Conflicts:
	.idea/workspace.xml
	AndroidManifest.xml
	src/tipsy/app/LoginActivity.java
1
Merge branch 'EventOrga' of https://github.com/tipsyproject/android into EventOrga

Conflicts:
	.idea/workspace.xml
	res/layout/activity_orga_editer_event.xml
	res/layout/activity_orga_home.xml
	res/layout/fragment_orga_edit_event_desc.xml
	res/layout/fragment_orga_editer_event.xml
	res/values/colors.xml
	res/values/strings.xml
	src/tipsy/app/orga/EditEventActivity.java
	src/tipsy/commun/Organisateur.java