Merge branch 'master' of https://github.com/tibelf/wejoy
Merge branch 'master' of https://github.com/tibelf/wejoy

Conflicts:
	src/main/webapp/WEB-INF/vm/shopcircle.vm