Merge pull request #553 from azul/hook-generator-in-controller-generator

hook generator from controller generator
depreciated -> deprecated
Merge pull request #556 from santry/patch-1

depreciated -> deprecated [ci skip]
Rails 4.0 :sparkles:

Test against released Rails 4.0 and Rails 4.1 dev; use Rails 4.0 by
default in development.
Delegate `to_s` to object

Closes #560
Merge pull request #561 from haines/to_s

Delegate `to_s` to object
Fix RSpec deprecations
Fix Decorator#inspect on Ruby 1.9

1.9 uses `to_s`, if defined, for `inspect`, so with `to_s` delegated,
it's difficult to distinguish the decorator from the object at the
console.

This hacks `inspect` to return the same thing on 1.9 as it does on 2.0
Add more route helper integration specs
Merge pull request #563 from haines/to_s

Fix Decorator#inspect on Ruby 1.9
Use released Devise version
Add activemodel runtime dependency.
Merge pull request #566 from jgraichen/active_model_dependency

Add activemodel runtime dependency.
Renamed minitest helper to test_helper
Releasing 1.3.0
update CHANGELOG
Inherit decorator from superclass.

If the class itself does not have a decorator, try the superclass.
Merge pull request #570 from Linuus/rename-minitest-helper

Renamed minitest helper to test_helper
Merge remote-tracking branch 'upstream/master'
Fixed dummy mongoid config.