form DSL support for formtastic's semantic_errors method
styles for semantic_errors display
CSS whitespace normalization
Merge remote-tracking branch 'upstream/master'
Exclude devise :timedout from flash messages
https://github.com/grosser/parallel_tests setup, now the default rake task
fix for Travis CI, forgot to assert existence of database.yml
ruby workers have  only 1 core per machine, using rake test for Travis CI builds
Fixed syntax in example
Re-works previous commit
Decorator support for index and show
Added config option to set default CSV builder separator
Added fix for issue #1610 - filtering the index when not on the first page should reset pagination to show the first page of results.
Modified method of transforming 'except' argument into an array in fields_for_params, per suggestion from jpmckinney.  Also added a spec to test this case.
Removed unnecessary check for except being Enumerable in fields_for.
Merge pull request #1611 from tinynumbers/index-filter-page-fix

Added fix for issue #1610 - filtering the index when not on the first page should reset pagination to show the first page of results.
fix quotes
Merge pull request #1608 from railscard/default-csv-separator

Added config option to set default CSV builder separator
Fix for #1619.

Migrate method body is moved before change method body in generated
migration file.
Merge pull request #1620 from TaiGat/1619-default-admin-user

Fix for #1619.