Ongoing
Trying new stuff
Ongoing
Ongoing
Ongoing
Ongoing

Conflicts:
	applications/de-webapp/src/main/java/org/iplantc/de/client/DiscoveryEnvironment.java
	applications/de-webapp/src/main/java/org/iplantc/de/client/newDesktop/views/NewDesktopViewImpl.java
ongoing

Conflicts:
	applications/de-webapp/src/main/java/org/iplantc/de/client/newDesktop/views/NewDesktopViewImpl.java
Ongoing

Conflicts:
	applications/de-webapp/src/main/java/org/iplantc/de/client/newDesktop/views/NewDesktopViewImpl.java
	applications/de-webapp/src/main/java/org/iplantc/de/theme/base/client/desktop/BaseDesktopAppearance.java
	applications/de-webapp/src/main/java/org/iplantc/de/theme/base/client/desktop/Desktop.css
Desktop styles now match original