Merge branch 'master' of https://github.com/caoguangyao/BTV-android

Conflicts:
	BTVProject/.idea/gradle.xml
	BTVProject/.idea/libraries/ComAndroidSupportAppcompatV71900_aar.xml
	BTVProject/.idea/misc.xml
	BTVProject/BTV/BTV.iml
gitignore
ignore files