1. The main Application view ver.1,
2. Deleted the Channels Activity
Merge branch 'master' of github.com:SayOmgPlz/AppTv

Conflicts:
	res/layout/activity_main.xml
	src/com/lytcho/apptv/MainActivity.java