error_reporting  => display_error
Merge branch 'master' of git@github.com:gridguyz/core.git
Merge branch 'master' into testing