negligible html formatting improvement in admin -> add new user

negligible html formatting improvement in admin -> add new user
Merge pull request #1255 from dev101-osclass/patch-4

negligible html formatting improvement in admin -> add new user
issue #1005 plugins' files could be deleted now, it doesn't work everytime de to permission problems, even we try to change the permissions before the delete
passed params to pre_send_email filter, attr like to, subject, from, body...
Merge pull request #1278 from osclass/hotfixes

Hotfixes
Merge pull request #1272 from garciademarina/sendemail-improvement

passed params to pre_send_email filter, attr like to, subject, from, body...
Merge remote-tracking branch 'upstream/hotfixes' into mergedev

Conflicts:
	oc-includes/osclass/utils.php
Merge pull request #1292 from osclass/mergedev

Mergedev
Merge pull request #1302 from conejoninja/1005b

issue #1005 plugins' files could be deleted now, it doesn't work everyti...
Merge pull request #1303 from osclass/hotfixes

Hotfixes
Update hUsers.php

corrected function description
Use function splitSQL introduced on #966 when update Osclass
Merge pull request #1327 from dev101-osclass/patch-7

Update hUsers.php
Merge pull request #1332 from rbngzlv/develop

Use function splitSQL introduced on #966 when update Osclass
Merge branch 'hotfixes' into develop
osc_sanitizeString: added single quote to hyphen conversion
fix osc_add_flash_error_message
Add osc_is_404() to chec for error 404 error

Get if the user is on 404 error page
Improvement: Facto redundant code in osc_static_page_meta()
tiny typo in /** doc */