Refactoring dependencies to be in constructors rather than methods
Merge branch 'master' of https://github.com/EventBooking/AntiShaun