added content to the controller
ddferge branch 'controllerContact'

Conflicts:
	application/controllers/pages.php