#40 Changed controller event to separate services from controllers
Merge branch 'dev' of https://github.com/Ornro/ThatNight into dev