bundle update: rails 3
Merge branch 'development'