Adding Coordinator project back to eclipse config
Fixing eclipse config
Merge branch 'protocol_2'

Conflicts:
	coordinator_eclipse_workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.markers
	coordinator_eclipse_workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi