startup scripts
Merge branch 'develop' of tapir.github.com:intrigueio/tapir
updated from production (with restart script)