Corrected test failures
Conflicts:
	src/main/java/org/iplantc/core/uidiskresource/client/presenters/DiskResourcePresenterImpl.java
add data search history
Merge remote-tracking branch 'origin/gxt3-sandbox' into strootman-dev

Conflicts:
	src/main/java/org/iplantc/core/uidiskresource/client/views/DiskResourceView.ui.xml
Minor changes to Disk resource view