Only add database tasks to Rakefile if ORM is anything other than :none
Merge pull request #1201 from padrino/carefully-generate-orm-tasks-on-Rakefile

Only add database tasks to Rakefile if ORM is anything other than :none
Migrations are timestamped if so specified in .components file
Fixed test helper, replaced hardcoded value with param
add `migration_format` option to specify number or timestampe migration file format
update CHANGES
Added padrino-performance to release list
Put fix "Preserve spaces for text_area using admin/haml" on
0048cef99923c1eac6499161c0b1a01e569807de back.
Fixes #1207.
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.
Merge remote-tracking branch 'upstream/master'