resolve mergeing problems
Merge branch 'mysql' into frontend

Conflicts:
	Diary/target/m2e-wtp/web-resources/META-INF/maven/Diary/Diary/pom.properties