fix commit
Merge branch 'master' of ssh://git@github.com/trickyil2000/SingelPD.git

Conflicts:
	controllers/contents_controller.php
	settings/routes.php