Conflicts:
	railties/test/generators/app_generator_test.rb

Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Fixed: #without_typecast should only disable typecasting on the duplicated attributes [#3387 state:resolved]
Signed-off-by: NJoshua Peek <josh@joshpeek.com>

This is routing error message test is tightly coupled to the implementation. Just test that it raises an exception.

Fix standalone run of routing test. Only reference controllers that are provided in fake_controllers

No longer need this special routing exception message because these kinds of ambiguous generations are deprecated

By default use ActiveModel API in controller generators, unless otherwise specified [#3123 status:resolved]

Signed-off-by: NJoshua Peek <josh@joshpeek.com>