fix typo
make mocha local
users listing api finished basically
Merge pull request #20 from Fritz-Lium/master

users listing api
Merge pull request #1 from Jayin/master

add main activity layout
edit  acty_Main.java
add ADView.java and some tool
Merge pull request #2 from Jayin/master

update acty_main
add acty_allmember.xml
adview 智能切换缓存；自动适配
ww
Merge pull request #22 from VectorWen/master

加入了allmember layout and entity class
完善allmember,增加了alldynamic
Merge pull request #23 from VectorWen/master

完善allmember,增加了alldynamic
before i edit
Merge branch 'master' of https://github.com/Jayin/SiyuanGroup

Conflicts:
	SiyuanGroup/res/layout/acty_allmember.xml
Alldynamic.java
Merge pull request #24 from VectorWen/master

Alldynamic.java
edit
edit