merged geo label jsf components
fixed jsf component CDATA encoding
fixed test scope issues
preparation for jsf landing page