Improved build.sh and service.sh
Merge branch 'master' into drobofs