添加日记上传图片API
Merge pull request #1 from daydayfree/master

添加日记上传图片API
Merge branch 'master' of github.com:liluo/douban-client
同步liluo分支, 消除冲突文件.

Merge branch 'master' into 2to3

Conflicts:
	douban_client/client.py
	tests/test_api_note.py
requirements.txt: py-oauth2最低版本修改为0.0.7
fix bug: DoubanApi -> DoubanAPI