allow database names to be configured
Merge branch 'develop' into k-anderson-master

Conflicts:
	api/AccessControlKazoo.php
	api/providers.php