upgrade to rails 3.2.10 and restructured the Gemfile a bit
Merge branch 'master' into upgrade_to_rails_3.2.10
Merge pull request #2 from RubyFriends/upgrade_to_rails_3.2.10

upgrade to rails 3.2.10 and restructured the Gemfile a bit