Merge branch 'devel' of dev.sourcefabric.org:airtime into cc-2528-use-virtualenv-for-installing

Conflicts:
	python_apps/media-monitor/airtime-media-monitor

python_apps/pypo/airtime-liquidsoap

@@ -5,7 +5,7 @@ virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
 
 ls_user="pypo"
 export HOME="/var/tmp/airtime/pypo/"
-api_client_path="/usr/lib/airtime/pypo/"
+api_client_path="/usr/lib/airtime/"
 ls_path="/usr/lib/airtime/pypo/bin/liquidsoap_bin/liquidsoap"
 ls_param="/usr/lib/airtime/pypo/bin/liquidsoap_scripts/ls_script.liq"
 

python_apps/pypo/airtime-playout

@@ -7,7 +7,7 @@ pypo_user="pypo"
 
 # Location of pypo_cli.py Python script
 pypo_path="/usr/lib/airtime/pypo/bin/"
-api_client_path="/usr/lib/airtime/pypo/"
+api_client_path="/usr/lib/airtime/"
 pypo_script="pypo-cli.py"
 cd ${pypo_path}
 exec 2>&1

python_apps/pypo/install/pypo-install.py

@@ -96,7 +96,6 @@ try:
       sys.exit(1)
   
   copy_dir("%s/.."%current_script_dir, config["bin_dir"]+"/bin/")
-  copy_dir("%s/../../api_clients"%current_script_dir, config["bin_dir"]+"/api_clients/")
   
   print "Setting permissions"
   os.system("chmod -R 755 "+config["bin_dir"])