Re-added code for protected functions.
Removed the "useExpandedColumnAliases" setting.
Merge branch 'master' of https://github.com/cfwheels/cfwheels