Recommit Choose Plan Type
Merge branch 'master' of https://github.com/globeestate11/estate

Conflicts:
	application/controllers/plan.php
	application/views/globe-estate-blue/sections/pages/page_plan.php
Merge branch 'master' of https://github.com/globeestate11/estate

Conflicts:
	application/controllers/plan.php