updated rails version from 3.2.13 to 3.2.18 in Gemfile and Gemfile.lock
Merge branch 'master' into deployment