Merge branch 'master' of git.ubicast.net:mediaserver/envsetup

1.Base/4.Proxy_settings/0_setup.py

2.Common_services/4.Wowza/0_setup.py

2.Common_services/4.Wowza/Proxy.xml

2.Common_services/4.Wowza/live-application.xml.bak

2.Common_services/4.Wowza/wowza-update.sh.back

...ent_configuration/1.Apply_client_configuration/0_setup.sh

3.New_server_deployment/3.Initialize_APT/0_setup.sh

global-conf.sh

launcher.sh