update

Signed-off-by: zhaoyonggang <zhaoyonggang@jd.com>
Merge branch 'master' of https://github.com/tibelf/wejoy

Conflicts:
	src/main/java/com/jd/wejoy/controller/CenterController.java
	src/main/webapp/WEB-INF/vm/custom_share.vm