adding this new branch
Merge branch 'will_dev' of https://github.com/tomacoast/Quik-Channel into will_dev

Conflicts:
	WorkspaceI/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi