Merge branch 'dev'
Merge branch 'master' of https://github.com/katerman/framework

Conflicts:
	admin/add.php
	admin/delete.php
	admin/error_log
	admin/security.log
	admin/views/add/add_page.inc
	admin/views/default_view.inc
	admin/views/edit/edit_page.inc
	js/admin.js
	js/admin_ajax.js
	js/jquery.min.js