Updating DAWCS.java and ChannelController.java
Merge branch 'master' of https://github.com/adamwilhelmi/DAWCS

Conflicts:
	src/com/cs/oswego/edu/dawcs/ChannelController.java