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

Conflicts:
	access.log
	application/controllers/AjaxController.php
	error.log
	html/css/layout-10.css
	html/hb/JKY-utils.html
	html/index.html
	html/js/JKY-utils.js
Resolve conflicts