Test timed events
Abort triggers from within rooms (feature #3044)
Merge branch 'test-timed-event' into feature/abort-triggers
Add a test case for abortTriggers
Set the abortTriggers property
Merge branch 'master' into feature/abort-triggers
Feature #3047 - Added basic support for cutscenes and for moving the player around via triggers.
Merge branch 'master' into feature/cutscenes

Conflicts:
	src/web/js/Test.js
Merge branch 'master' into feature/cutscenes
Fix elevator
Remove the delay and the player-moved event
Added isCutscene property to walls that, if present and set to true, will disable the movement buttons when the cutscene is entered.
Added textures to faculty area cubicles, office chairs, tables.
Added sample enter/exit cutscene triggers to the test Scenario.
Feature #2669 - Added automatic highlighting to cellphone that guides user to new cellphone content/options.
Merge branch 'master' of https://github.com/rcatlin/Emergency-Response
brighter images in the stairwell
master branch merge
Add backup files to .gitignore
Merge pull request #69 from rcatlin/fix/elevator

Fix/elevator