merge with repo
core-5802 add editing support of for scripting languages. Unit test new menu items pending.
core-5804 fix sorting issue in permissions panel of share dialog
core-5802 add markdown syntax highlighting and preview rendering support. Allow users to save rendered html.
Remove reset.css so that it does not affect markdown rendering.
Begin re-org of DE desktop
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
Refactored desktop user settings menu