Merge pull request #64 from bxl1989/master

fix bug?
add sinaWeiboToken
.
fix conflict
Merge pull request #44 from roselone/master

access token