changed dependencies' version for Rails 3.2.18 in Gemfile.lock
Merge branch 'master' into deployment