change actionpack version from 3.2.13 to 3.2.18 in Gemfile.lock
Merge branch 'master' into deployment
Merge branch 'deployment' of https://github.com/ualbertalib/DMPonline_v4 into deployment