clean up script
add connexion string to conf.sh
Merge remote branch 'origin/master'