Controller and Search
Merge remote-tracking branch 'origin/master'

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