fixed upstart script
Merge branch 'develop'