Change startbutton conditions
Merge branch 'master' of ../stage