Merge branch 'refs/heads/master' into resource-wid

Conflicts:
	edu.oregonstate.cope.eclipse/src/edu/oregonstate/cope/eclipse/listeners/ResourceListener.java