更新
Merge branch 'master' of https://github.com/wikimo/jinbi

Conflicts:
	WebContent/public/css/style.css
更新

将接口由oauth改为api，里面的redirect_url参数移除
Merge branch 'master' of https://github.com/wikimo/jinbi.git
更新
更新
Merge branch 'master' of https://github.com/wikimo/jinbi.git

Conflicts:
	WebContent/users/usersshow.jsp