合并代码
test
zzz
Merge branch 'develop' of https://github.com/wolfbing/AndroidTest

Conflicts:
	Test/bin/Course.apk
	Test/bin/classes.dex
	Test/bin/resources.ap_
	Test/gen/com/example/course/R.java