Fixed deprecation warning: has_many :conditions option
has_many rails 3 and 4 compatibility
resolved naming conflict with Doorkeeper::Rails module
Merge pull request #1 from mirego/fix-rails4-deprecated-warning

fix-rails4-deprecated-warning