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

Conflicts:
	config/config.mutable.php
Adding a blank config