Updated Gemfile and Gemfile.lock to latest gems (exceptions: rspec/ci_reporter/tinymce)
Merge branch 'master' of https://github.com/ualbertalib/DMPonline_v4