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

Conflicts:
	application/controllers/home.php
	application/controllers/order.php
	application/controllers/subscriber.php
	application/models/estate/subscriber_model.php
	application/views/globe-estate-blue/sections/pages/partials/ftscript_subscriber.php
Merge branch 'master' of https://github.com/globeestate11/estate