Merge branch 'master' of github.com:cescoff/untitled2

Conflicts:
	.idea/libraries/Maven__org_springframework_social_spring_social_config_1_1_0_BUILD_SNAPSHOT.xml
Merge branch 'master' of github.com:cescoff/untitled2
Loclisation des images à l'ouest ;)
Merge branch 'master' of github.com:cescoff/untitled2