Tyding up conflicting logic on email alerts

HTML2Text was being called on message, but we're sending messages as HTML.
This was producing nasty emails and sad alertees.

Removed the call to HTML2Text and wrapped functino on text::auto_p() to
produce better looking messages
Updating send class to attach a plain text version to message when $html = true
Cleaning up alerts scheduler
Revert "Merge pull request #1218 from ditorelo/1213b"

This reverts commit 0d313c1b3e13430e64d60d05d0f681850cbd95c6.
Related to #1218 #1233
Normalize json markers to object #1233
Escaping db password (Issue #1265)

Adding addslashes on wizard so it scapes passwords nicely! :)
Sanatizing all data being written about db connection
Update upload.php

There was a bug in multiple file uploads, now I've fixed.
#623 Feed Category
#1289 failsafe alert for multiple subscription
#1284 setting report alert days
Fix inconsistency in custom fields position
Merge pull request #1296 from gilfu/develop

Fix inconsistency in custom fields position
Merge pull request #1286 from dmahesh22/master

Update upload.php
Merge pull request #1291 from HTSolution/develop

#623 Feed Category
Merge pull request #1276 from ditorelo/1265-password-parse

Escaping db password (Issue #1265)
Merge pull request #1249 from ditorelo/943

Tiding up conflicting logic on email alerts (Issue #943)
2.7.2b -Bug Fix release Beta
Adding back code removed by mistake
Version 2.7.2