fix HTML entity decoding for plain text email
Revert change that breaks login redirect

Revert change to App_hooks in e80681df32a68971b100dcc231c2734d22a2e6aa
Update MY_Model.php

update_where for multiple field
Merge pull request #922 from vachzar/patch-1

Update MY_Model to support multiple fields in the update_where command. At some point, we need to make sure all of the methods take multiple options.
Update MY_Model.php

fix little typo
Merge pull request #923 from vachzar/patch-2

Update MY_Model.php
Refactoring iif method to test for true/false on $echo instead of 0. Fixes #926
Updating change log so we're current.
Merge branch 'develop' into modules

# By Lonnie Ezell (2) and others
* develop:
  Updating change log so we're current.
  Refactoring iif method to test for true/false on $echo instead of 0. Fixes #926
  Update MY_Model.php
  Update MY_Model.php
  Revert change that breaks login redirect
  fix HTML entity decoding for plain text email