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 #1282 from conejoninja/hotfixes

added some more params to filters
Merge pull request #1272 from garciademarina/sendemail-improvement

passed params to pre_send_email filter, attr like to, subject, from, body...
small fix
Merge branch 'hotfixes'
wrong hook name
fixed issue #1239
some fixes on version update
update version and changelog
Merge pull request #1286 from conejoninja/fixes

Fixes
Merge pull request #1287 from osclass/hotfixes

Hotfixes
issue #1239
Merge branch 'hfix' into conejoninja-hfix

Conflicts:
	oc-includes/osclass/model/Field.php
Merge pull request #1289 from conejoninja/conejoninja-hfix

Conejoninja hfix
Merge pull request #1290 from osclass/hotfixes

Hotfixes
Merge remote-tracking branch 'upstream/hotfixes' into mergedev

Conflicts:
	oc-includes/osclass/utils.php