partial progress
Merge branch 'master' into controllers
Merge branch 'master' into controllers
Merge remote-tracking branch 'origin/master' into controllers
fix controllers to work with before filter
Merge pull request #26 from nastysloper/controllers

fix controllers to work with before_filter