Fixed deprecation warning: has_many :conditions option
has_many rails 3 and 4 compatibility
resolved naming conflict with Doorkeeper::Rails module
Merge 'Rails 4 deprecation warning' from 'asoules/master'
Trailing white space and Ruby 1.9 hash syntax