before_filter turned into before_action
Merge pull request #2956 from Yasserius/patch-1

before_filter turned into before_action