add post user, shop

Conflicts:
	src/main/java/com/mallgo/rest/ShopRestBean.java
	src/main/java/com/mallgo/rest/UserRestBean.java

test

test 1

clean test

add rest
Merge remote-tracking branch 'github/master'