Moved trigger code into a single lua file, not split yet
Merge branch 'master' into Savil (code moved from triggers to lua file)