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

Conflicts:
	application/views/globe-estate-blue/sections/pages/partials/ftscript_payment.php
Merge branch 'master' of https://github.com/globeestate11/estate
Merge branch 'master' of https://github.com/globeestate11/estate
Merge branch 'master' of https://github.com/globeestate11/estate
Merge branch 'master' of https://github.com/globeestate11/estate
Merge branch 'master' of https://github.com/globeestate11/estate
Merge branch 'master' of https://github.com/globeestate11/estate
fix conflict in ftscript_payment.php