Merge branch 'master' into log-in-contrast

Gemfile

Gemfile.lock

app/assets/images/icons/collection-add.png

app/assets/images/icons/collection-download.png

app/assets/images/icons/collection-fast.png

app/assets/images/icons/collection-items.png

app/assets/images/icons/collection-remove.png

app/assets/images/icons/collection.png

app/assets/images/icons/comments.png

app/assets/images/icons/contrast.png

app/assets/images/icons/download.png

app/assets/images/icons/filter.png

app/assets/images/icons/font-minus.png

app/assets/images/icons/font-plus.png

app/assets/images/icons/report-circle.png

app/assets/images/icons/report.png

app/assets/images/icons/search.png

app/assets/images/icons/selection-copy.png

app/assets/images/icons/selection-download.png

app/assets/images/icons/selection-move.png