helper
Merge branch 'master' of https://github.com/dixanta/kgarira

Conflicts:
	application/helpers/easyui_helper.php