Merge branch nwaweru/essential/develop RufusMbugua/essential/#

Conflicts:
	application/modules/template/views/template_v.php

Added landing page in the module 'welcome'