Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	desktop-application/desktop-application.iml
	untitled/untitled.iml
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:
	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