Loclisation des images à l'ouest ;)
Mise en place de l'upload auto
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/compiler.xml
	.idea/libraries/Maven__org_springframework_social_spring_social_config_1_1_0_BUILD_SNAPSHOT.xml
	.idea/libraries/Maven__org_springframework_social_spring_social_core_1_1_0_BUILD_SNAPSHOT.xml
	.idea/libraries/Maven__org_springframework_social_spring_social_facebook_1_1_0_BUILD_SNAPSHOT.xml
	.idea/libraries/Maven__org_springframework_social_spring_social_facebook_web_1_1_0_BUILD_SNAPSHOT.xml
	.idea/libraries/Maven__org_springframework_social_spring_social_twitter_1_1_0_BUILD_SNAPSHOT.xml
	.idea/libraries/Maven__org_springframework_social_spring_social_web_1_1_0_BUILD_SNAPSHOT.xml
	.idea/modules.xml
	mpl-android/mpl-android.iml
	pom.xml