still working on posting pics
Merge branch 'master' of https://github.com/rahulgi/ICS-Channels

Conflicts:
	bin/classes/com/example/channellist/ChannelUI$1.class
	bin/classes/com/example/channellist/ChannelUI$2.class
	bin/classes/com/example/channellist/ChannelUI$CameraCaptureTask.class
	bin/classes/com/example/channellist/ChannelUI.class
pull commit 2