Merge pull request #131 from mehere/dev

Pull
Merge pull request #132 from mehere/dev

Pull Request from dev -> dev-wee on
Modified SMS.php to determine the type of sms, and attach a reply request if appropriate
Modified Notification.php (date format)
Modified Notification.php (date format)
Merge pull request #133 from mehere/dev-wee

Modified Notification.php (date format)