Merge branch 'master' into 5-irods-ref-resource

Author: hyi

hydroshare/local_settings.py

@@ -183,4 +183,5 @@
 
 TIME_ZONE = "Etc/UTC"
 
-PIVOT_URL = ""
+# fill out pivot/scidas url in your deployment
+PIVOT_URL = ""

theme/views.py

@@ -579,7 +579,7 @@ def create_scidas_virtual_app(request, res_id, cluster):
                     if 'id' in jdata and 'containers' in jdata:
                         p_data = jdata
 
-    url = "http://sc17demo1.scidas.org:9090/appliance"
+    url = settings.PIVOT_URL
     app_id = user.username + '_cs_app_id'
     preset_url = ''
     if not p_data: