Working Attribute Pane
Working Attribute Pane
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/edu/odu/icat/graphicsinterface/WorkSpace.java