diff --git a/livesupport/bin/user_setup.sh b/livesupport/bin/user_setup.sh
index 92f29f582..0faaf9e59 100755
--- a/livesupport/bin/user_setup.sh
+++ b/livesupport/bin/user_setup.sh
@@ -21,8 +21,8 @@
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #
-#   Author   : $Author: maroy $
-#   Version  : $Revision: 1.3 $
+#   Author   : $Author: fgerlits $
+#   Version  : $Revision: 1.4 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/user_setup.sh,v $
 #-------------------------------------------------------------------------------                                                                                
 #-------------------------------------------------------------------------------
@@ -303,7 +303,7 @@ cat $products_dir/scheduler/etc/scheduler.xml.template \
     | sed -e "$replace_sed_string" \
     > $configdir/scheduler.xml
 
-cat $products_dir/gLiveSupport/etc/gLiveSupport.xml.template \
+cat $products_dir/gLiveSupport/etc/gLiveSupport.xml.user-template \
     | sed -e "$replace_sed_string" \
     > $configdir/gLiveSupport.xml
 
diff --git a/livesupport/products/gLiveSupport/etc/gLiveSupport.xml.template b/livesupport/products/gLiveSupport/etc/gLiveSupport.xml.template
index f69a47e6f..d80b226e5 100644
--- a/livesupport/products/gLiveSupport/etc/gLiveSupport.xml.template
+++ b/livesupport/products/gLiveSupport/etc/gLiveSupport.xml.template
@@ -116,7 +116,7 @@
     </authenticationClientFactory>
 
     <storageClientFactory>
-        <webStorage tempFiles="file:///ls_install_dir/tmp/webStorageClient" >
+        <webStorage tempFiles="file://ls_install_dir/tmp/webStorageClient" >
             <location server="ls_php_host" port="ls_php_port"
                       path="/ls_php_urlPrefix/storageServer/var/ls_alib_xmlRpcPrefix"/>
         </webStorage>
diff --git a/livesupport/products/gLiveSupport/etc/gLiveSupport.xml.user-template b/livesupport/products/gLiveSupport/etc/gLiveSupport.xml.user-template
new file mode 100644
index 000000000..74d79c9ed
--- /dev/null
+++ b/livesupport/products/gLiveSupport/etc/gLiveSupport.xml.user-template
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE gLiveSupport [
+
+<!ELEMENT gLiveSupport                (resourceBundle,
+                                       supportedLanguages,
+                                       widgetFactory,
+                                       authenticationClientFactory,
+                                       storageClientFactory,
+                                       schedulerClientFactory,
+                                       outputPlayer,
+                                       cuePlayer,
+                                       metadataTypeContainer) >
+
+<!ELEMENT resourceBundle    EMPTY >
+<!ATTLIST resourceBundle    path    CDATA   #REQUIRED >
+<!ATTLIST resourceBundle    locale  CDATA   #REQUIRED >
+
+<!ELEMENT supportedLanguages    (language+) >
+
+<!ELEMENT language          EMPTY >
+<!ATTLIST language          locale          CDATA #REQUIRED >
+<!ATTLIST language          name            CDATA #REQUIRED >
+
+<!ELEMENT widgetFactory   EMPTY >
+<!ATTLIST widgetFactory   path        CDATA   #REQUIRED >
+
+<!ELEMENT authenticationClientFactory (testAuthentication|
+                                       webAuthentication)>
+
+<!ELEMENT testAuthentication (user) >
+
+<!ELEMENT webAuthentication (location) >
+
+<!ELEMENT location EMPTY >
+<!ATTLIST location server   CDATA       #REQUIRED >
+<!ATTLIST location port     NMTOKEN     #REQUIRED >
+<!ATTLIST location path     CDATA       #REQUIRED >
+
+<!ELEMENT user EMPTY >
+<!ATTLIST user login        CDATA       #REQUIRED >
+<!ATTLIST user password     CDATA       #REQUIRED >
+
+<!ELEMENT storageClientFactory (testStorage|webStorage) >
+
+<!ELEMENT testStorage (playlist*, audioClip*) >
+<!ATTLIST testStorage tempFiles CDATA       #REQUIRED >
+
+<!ELEMENT playlist (playlistElement*) >
+<!ATTLIST playlist id           NMTOKEN     #REQUIRED >
+<!ATTLIST playlist playlength   NMTOKEN     #REQUIRED >
+
+<!ELEMENT playlistElement ((audioClip|playlist), fadeInfo?) >
+<!ATTLIST playlistElement id              NMTOKEN     #REQUIRED >
+<!ATTLIST playlistElement relativeOffset  NMTOKEN     #REQUIRED >
+
+<!ELEMENT audioClip EMPTY >
+<!ATTLIST audioClip id              NMTOKEN     #REQUIRED >
+<!ATTLIST audioClip playlength      NMTOKEN     #REQUIRED >
+<!ATTLIST audioClip title           CDATA       #REQUIRED >
+<!ATTLIST audioClip uri             CDATA       #REQUIRED >
+
+<!ELEMENT fadeInfo EMPTY >
+<!ATTLIST fadeInfo id              NMTOKEN     #REQUIRED >
+<!ATTLIST fadeInfo fadeIn          NMTOKEN     #REQUIRED >
+<!ATTLIST fadeInfo fadeOut         NMTOKEN     #REQUIRED >
+
+<!ELEMENT webStorage (location) >
+<!ATTLIST webStorage tempFiles CDATA       #REQUIRED >
+
+<!ELEMENT schedulerClientFactory        (schedulerDaemonXmlRpcClient) >
+
+<!ELEMENT schedulerDaemonXmlRpcClient   EMPTY >
+<!ATTLIST schedulerDaemonXmlRpcClient xmlRpcHost    CDATA       #REQUIRED >
+<!ATTLIST schedulerDaemonXmlRpcClient xmlRpcPort    NMTOKEN     #REQUIRED >
+<!ATTLIST schedulerDaemonXmlRpcClient xmlRpcUri     CDATA       #REQUIRED >
+
+<!ELEMENT outputPlayer  (audioPlayer) >
+<!ELEMENT cuePlayer     (audioPlayer) >
+
+<!ELEMENT audioPlayer   (helixPlayer) >
+
+<!ELEMENT helixPlayer   EMPTY >
+<!ATTLIST helixPlayer   dllPath     CDATA   #REQUIRED >
+<!ATTLIST helixPlayer   audioDevice          CDATA     #IMPLIED  >
+<!ATTLIST helixPlayer   audioStreamTimeout   NMTOKEN   #IMPLIED >
+<!ATTLIST helixPlayer   fadeLookAheatTime    NMTOKEN   #IMPLIED >
+
+<!ELEMENT metadataTypeContainer (metadataType+) >
+
+<!ELEMENT metadataType EMPTY >
+<!ATTLIST metadataType  dcName            NMTOKEN     #REQUIRED >
+<!ATTLIST metadataType  id3Tag            CDATA       #IMPLIED  >
+<!ATTLIST metadataType  localizationKey   NMTOKEN     #REQUIRED >
+]>
+
+<gLiveSupport>
+    <resourceBundle path   = "./tmp/gLiveSupport"
+                    locale = "en"
+    />
+
+    <supportedLanguages>
+        <language locale="en"               name="English"/>
+        <language locale="es"               name="Español"/>
+        <language locale="hu"               name="Magyar"/>
+        <language locale="sr_CS"            name="Srpski"/>
+        <language locale="sr_CS_CYRILLIC"   name="Српски"/>
+    </supportedLanguages>
+
+    <widgetFactory    path = "var/widgets/" />
+
+    <authenticationClientFactory>
+        <webAuthentication>
+            <location server="ls_php_host" port="ls_php_port"
+                      path="/ls_php_urlPrefix/storageServer/var/ls_alib_xmlRpcPrefix"/>
+        </webAuthentication>
+    </authenticationClientFactory>
+
+    <storageClientFactory>
+        <webStorage tempFiles="file://ls_install_dir/tmp/webStorageClient" >
+            <location server="ls_php_host" port="ls_php_port"
+                      path="/ls_php_urlPrefix/storageServer/var/ls_alib_xmlRpcPrefix"/>
+        </webStorage>
+    </storageClientFactory>
+
+    <schedulerClientFactory>
+        <schedulerDaemonXmlRpcClient   xmlRpcHost = "ls_scheduler_host"
+                                       xmlRpcPort = "ls_scheduler_port"
+                                       xmlRpcUri  = "/ls_scheduler_xmlRpcPrefix"
+        />
+    </schedulerClientFactory>
+
+    <outputPlayer>
+        <audioPlayer>
+            <helixPlayer dllPath = "ls_install_dir/lib/helix"
+                         audioDevice = "ls_output_dsp"
+            />
+        </audioPlayer>
+    </outputPlayer>
+
+    <cuePlayer>
+        <audioPlayer>
+            <helixPlayer dllPath = "ls_install_dir/lib/helix"
+                         audioDevice = "ls_cue_dsp"
+            />
+        </audioPlayer>
+    </cuePlayer>
+
+    <metadataTypeContainer>
+        <metadataType dcName          = "dc:title"
+                      id3Tag          = "TIT2"
+                      localizationKey = "title"
+        />
+        <metadataType dcName          = "dc:creator"
+                      id3Tag          = "TPE1"
+                      localizationKey = "creator"
+        />
+        <metadataType dcName          = "dc:source"
+                      id3Tag          = "TALB"
+                      localizationKey = "album"
+        />
+        <metadataType dcName          = "ls:year"
+                      id3Tag          = "TYER"
+                      localizationKey = "year"
+        />
+        <metadataType dcName          = "dc:type"
+                      id3Tag          = "TCON"
+                      localizationKey = "genre"
+        />
+        <metadataType dcName          = "dc:description"
+                      id3Tag          = "COMM"
+                      localizationKey = "description"
+        />
+        <metadataType dcName          = "dc:format"
+                      localizationKey = "format"
+        />
+        <metadataType dcName          = "ls:bpm"
+                      id3Tag          = "TBPM"
+                      localizationKey = "bpm"
+        />
+        <metadataType dcName          = "ls:rating"
+                      id3Tag          = "POPM"
+                      localizationKey = "rating"
+        />
+        <metadataType dcName          = "dcterms:extent"
+                      localizationKey = "length"
+        />
+        <metadataType dcName          = "ls:encoded_by"
+                      id3Tag          = "TENC"
+                      localizationKey = "encoded_by"
+        />
+        <metadataType dcName          = "ls:track_num"
+                      id3Tag          = "TRCK"
+                      localizationKey = "track_number"
+        />
+        <metadataType dcName          = "ls:disc_num"
+                      id3Tag          = "TPOS"
+                      localizationKey = "disc_number"
+        />
+        <metadataType dcName          = "ls:mood"
+                      id3Tag          = "TMOO"
+                      localizationKey = "mood"
+        />
+        <metadataType dcName          = "dc:publisher"
+                      id3Tag          = "TPUB"
+                      localizationKey = "publishing_label"
+        />
+        <metadataType dcName          = "ls:composer"
+                      id3Tag          = "TCOM"
+                      localizationKey = "composer"
+        />
+        <metadataType dcName          = "ls:bitrate"
+                      localizationKey = "bitrate"
+        />
+        <metadataType dcName          = "ls:channels"
+                      localizationKey = "channels"
+        />
+        <metadataType dcName          = "ls:samplerate"
+                      localizationKey = "sample_rate"
+        />
+        <metadataType dcName          = "ls:encoder"
+                      id3Tag          = "TSSE"
+                      localizationKey = "encoding_software"
+        />
+        <metadataType dcName          = "ls:crc"
+                      localizationKey = "checksum"
+        />
+        <metadataType dcName          = "ls:lyrics"
+                      localizationKey = "lyrics"
+        />
+        <metadataType dcName          = "ls:orchestra"
+                      id3Tag          = "TPE2"
+                      localizationKey = "orchestra_or_band"
+        />
+        <metadataType dcName          = "ls:conductor"
+                      id3Tag          = "TPE3"
+                      localizationKey = "conductor"
+        />
+        <metadataType dcName          = "ls:lyricist"
+                      id3Tag          = "TEXT"
+                      localizationKey = "lyricist"
+        />
+        <metadataType dcName          = "ls:originallyricist"
+                      id3Tag          = "TOLY"
+                      localizationKey = "original_lyricist"
+        />
+        <metadataType dcName          = "ls:radiostationname"
+                      id3Tag          = "TRSN"
+                      localizationKey = "radio_station_name"
+        />
+        <metadataType dcName          = "ls:audiofileinfourl"
+                      id3Tag          = "WOAF"
+                      localizationKey = "audio_file_info_url"
+        />
+        <metadataType dcName          = "ls:artisturl"
+                      id3Tag          = "WOAR"
+                      localizationKey = "artist_url"
+        />
+        <metadataType dcName          = "ls:audiosourceurl"
+                      id3Tag          = "WOAS"
+                      localizationKey = "audio_source_url"
+        />
+        <metadataType dcName          = "ls:radiostationurl"
+                      id3Tag          = "WORS"
+                      localizationKey = "radio_station_url"
+        />
+        <metadataType dcName          = "ls:buycdurl"
+                      id3Tag          = "WPAY"
+                      localizationKey = "buy_cd_url"
+        />
+        <metadataType dcName          = "ls:isrcnumber"
+                      id3Tag          = "TSRC"
+                      localizationKey = "isrc_number"
+        />
+        <metadataType dcName          = "ls:catalognumber"
+                      localizationKey = "catalog_number"
+        />
+        <metadataType dcName          = "ls:originalartist"
+                      id3Tag          = "TOPE"
+                      localizationKey = "original_artist"
+        />
+        <metadataType dcName          = "dc:rights"
+                      id3Tag          = "TCOP"
+                      localizationKey = "copyright"
+        />
+    </metadataTypeContainer>
+</gLiveSupport>
+
diff --git a/livesupport/products/scheduler/etc/scheduler.xml.template b/livesupport/products/scheduler/etc/scheduler.xml.template
index c83258ce2..58532d107 100644
--- a/livesupport/products/scheduler/etc/scheduler.xml.template
+++ b/livesupport/products/scheduler/etc/scheduler.xml.template
@@ -105,7 +105,7 @@
     </authenticationClientFactory>
 
     <storageClientFactory>
-        <webStorage tempFiles="file:///ls_install_dir/tmp/webStorageClient" >
+        <webStorage tempFiles="file://ls_install_dir/tmp/webStorageClient" >
             <location server="ls_php_host" port="ls_php_port"
                       path="/ls_php_urlPrefix/storageServer/var/ls_alib_xmlRpcPrefix"/>
         </webStorage>