Refactored some stuff and added some stuff to the trigger server
Merge branch 'master' of https://github.com/proog/spct-f2014.git