Merge branch 'master' of github.com:ChangeOrientedProgrammingEnvironment/clientRecorder into git

Conflicts:
	edu.oregonstate.cope.eclipse/META-INF/MANIFEST.MF
	edu.oregonstate.cope.eclipse/src/edu/oregonstate/cope/eclipse/StartPluginUIJob.java