messaging

messaging
Merge branch 'master' of https://github.com/kasunganegala/eportal

Conflicts:
	application/controllers/administration.php
	application/controllers/delivery.php
	application/controllers/permissions.php
	application/models/m_permissions.php
	application/views/header_loggedin.php
	application/views/v_administration_permission.php
	application/views/v_administration_user_management.php