debug
Merge branch 'master' of https://github.com/globeestate11/estate

Conflicts:
	application/controllers/subscriber.php
Merge branch 'master' of https://github.com/globeestate11/estate