Merge remote-tracking branch 'origin/home'

Conflicts:
	src/main/java/happyme/HappyMongoManaged.java
	src/main/java/happyme/HappymeEmotion.java
	src/main/java/happyme/IndexResource.java