newfiles
Merge branch 'master' of github.com:patjan/relations

Conflicts:
	application/Utility.php
	application/controllers/AjaxController.php