Merge branch 'mathua'
更新
更新
更新
更新
Merge branch 'mathua'

Conflicts:
	src/com/muzhiliwu/service/UserService.java
	src/com/muzhiliwu/service/gift/ShopService.java
mathua
2014-12-3 mathua
Merge branch 'mathua'
新添一些接口
Merge branch 'mathua'
更新---
Merge branch 'mathua'
Merge branch 'rolealiu'
admin ser
Merge branch 'master' into rolealiu
first setting branch