update base
Merge branch 'master' of https://github.com/Cangol/OneTV.git

Conflicts:
	src/mobi/cangol/mobile/onetv/BaseFragmentActivity.java
	src/mobi/cangol/mobile/onetv/MainActivity.java
	src/mobi/cangol/mobile/onetv/PlayVideoFragment.java