Merge branch 'master' of https://github.com/Jeremy-Shields/TenantProject

Conflicts:
	app/Config/database.php
	app/Controller/AppController.php
	app/View/Users/login.ctp
Merge branch 'master' of https://github.com/Jeremy-Shields/TenantProject