.
添加新组件
Merge branch 'master' of https://github.com/AnanasMan/api_demo.git

Conflicts:
	bin/classes/z/t/apollo/ProgressDialogActivity$1.class
	bin/classes/z/t/apollo/ProgressDialogActivity.class