Added layout option for controllers
fix generators for projects using shoulda and rr with Test::Unit
make Test::Unit tests actually run
Merge pull request #1212 from sshaw/master

Some fixes for Test::Unit/Shoulda/RR test cases
fix flash_tag() with multiple attributes.
Merge pull request #1213 from tmtm/fix-flash_tag-with-multiple-attributes

fix flash_tag() with multiple attributes.
Update TwitterBootstrap!
Update zh_cn.yml

modify some chinese translaction error.
Merge pull request #1215 from wayshall/patch-1

Update zh_cn.yml
Improved german translations.

Date formats fixed; no "," before an "und" as last word connector.
Merge pull request #1214 from WaYdotNET/master

Update TwitterBootstrap!
Merge pull request #1216 from thirtified/fixed-german-translations

Improved german translations.
Merge pull request #1209 from Ortuna/generator-controller-layout-option

Added layout option for controllers