修改主界面代码，添加设置界面，频道管理界面，设置界面的基本功能具体实现还未做，频道管理添加于删减功能未做。
Merge remote-tracking branch 'origin/master'

Conflicts:
	PushNews/AndroidManifest.xml
	PushNews/bin/AndroidManifest.xml
	PushNews/bin/PushNews.apk
	PushNews/bin/classes.dex
	PushNews/bin/resources.ap_
	PushNews/src/com/pushnews/app/ui/MainActivity.java