fix edit content
Merge branch 'master' of github.com:patrov/cnam

Conflicts:
	src/main/java/com/cnam/opennote/service/ContentService.java
 indexation