Updating setup
Merge branch 'adminPanel' of github.com:trusheim/PhoneInterceptor into adminPanel