added torch and mechanics to turn it on/off
Merge branch 'Jurien'
Merge branch 'master' into Alan