CORE-2772: removed the call to the edit-template service, which is no longer needed
(cherry picked from commit d314ef3b47356a652ccfc33a413a60709827ce4a)

Conflicts:

	src/main/java/org/iplantc/de/client/services/impl/TemplateServiceFacade.java
	src/main/java/org/iplantc/de/client/views/panels/CatalogMainPanel.java
CORE-3808: changed the clavin-java version
(cherry picked from commit f62abad317562a5c497174264e537c137bc20c4d)

Conflicts:

	pom.xml
CORE-1402: added a logout success page
(cherry picked from commit 1573ebdb74b5e2411e9d093e7536df020eb5d7c8)