Updated the way the triggers with custom timers reset
Fixed a bug in control room
Merge branch 'master' of https://github.com/Dzeta/The-Prisoner