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

Conflicts:
	mpl-android/mpl-android.iml
	untitled/src/main/java/fr/untitled2/entities/LogPersistenceJob.java
	untitled/src/main/java/fr/untitled2/servlet/api/LogUploadServlet.java
	untitled/untitled.iml
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

Conflicts:
	.idea/libraries/Maven__org_springframework_social_spring_social_config_1_1_0_BUILD_SNAPSHOT.xml