fixed highlight issue with new lines #776
Merge branch 'develop' into hotfixes

Conflicts:
	oc-includes/osclass/helpers/hUtils.php