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

Conflicts:
	untitled/src/main/java/fr/untitled2/entities/Log.java
Merge branch 'master' of https://github.com/cescoff/untitled2

Conflicts:
	untitled/src/main/java/fr/untitled2/entities/Log.java