初始化
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/xxworkshop/qiniu/QiniuUploader.java
	src/com/xxworkshop/qiniu/test/Main.java
	xxqiniu_android.iml