Made scenes restartable
Merged the restarting into the master
Fixed a bug caused by merging