no message
Merge branch 'master' of https://github.com/MKLab-ITI/simmo

Conflicts:
	src/main/java/gr/iti/mklab/simmo/Object.java
	src/main/java/gr/iti/mklab/simmo/documents/Post.java