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

Conflicts:
	application/views/globe-estate/sections/pages/page_plan.php