Updated: Gemfile.lock to use latest version of gems
Merge branch 'master' of github.com:benjaminvialle/Markus into Gemfile
Merge branch 'master' into Gemfile
Updated gems
fix security flaw for download actions

 - edited authorized_to_download action
 - changed redirect with render in download_zip action
Merge pull request #1141 from GhiGt/download_problems

Fix: security flaw for download action.
Merge pull request #1138 from benjaminvialle/Gemfile

Updated Gemfile
Merge branch 'master' into issue-1126