Adam - updates for channels and UI
Adam - updates
Merge branch 'master' of https://github.com/adamwilhelmi/DAWCS

Conflicts:
	bin/DAWCS.apk
	bin/classes.dex
	src/com/cs/oswego/edu/dawcs/ChannelController.java