[AUTO] reindent JS / CSS
[AUTO] reindent controllers
[AUTO] reindent helpers
[AUTO] reindent mailers
[AUTO] reindent models
[AUTO] reindent configuration files
[AUTO] reindent the views (needs to get tweaked, though)
[AUTO] reindent the error pages
Merge branch 'master' into staging
fix merge conflicts, mostly re-tabbing stuff, but also changing things