ok
Merge branch 'HEAD' of https://github.com/nonumber1989/SevenUp.git

Conflicts:
	sevenup-service/src/main/java/org/sevenup/service/memo/MemoServiceHandler.java
kk