Added content permission creation / deletion & refactored some code
Merge branch 'master' of https://github.com/StickMen/powon

Conflicts:
	application/controllers/content.php
	application/models/content_model.php