Moved setup-ubuntu inside setup.sh
Merge branch 'master' into imo-desk