Fixed Rails 4 Controller Scaffold Generator.
Fixed Rails 3 compatibility.
Fixed test for Rails versions prior to 4
Merge pull request #445 from todd/fix-controller-scaffold-generator

Fixed Rails 4 Controller Scaffold Generator.
Merge branch 'embed_in_root_merge'
Merge remote-tracking branch 'plexus/has_one_each_serializer_fix'