Merge branch 'release/twitter'
Merge branch 'release/design'
minor fix
change to Rails 2.3.11
Merge branch 'hotfix/rails-version-update' into develop