bug
冲突
Merge branch 'master' of git@github.com:henzil/taxchina.git

Conflicts:
	src/com/dns/taxchina/ui/BaseActivity.java