CRLF will be replaced by LF
Merge branch 'hotfixes' of github.com:osclass/Osclass into hotfixes
Merge branch 'issue-759r2' into hotfixes
fixes
fix osc.js require jquery lib
CRLF will be replaced by LF
added hook render_admintoolbar
Merge branch 'hook-admintoolbar' into develop

Conflicts:
	oc-includes/osclass/assets/js/tiny_mce/plugins/ajaxfilemanager/jscripts/ajaximageeditor.js
	oc-includes/osclass/assets/js/tiny_mce/plugins/ajaxfilemanager/jscripts/ajaximageeditor_c.js