Ozzieisaacs 4708347c16 Merge branch 'Develop'
# Conflicts:
#	MANIFEST.in
#	README.md
#	cps/helper.py
#	cps/static/js/archive/archive.js
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt
..
arrow.svg Merge branch 'Develop'
cart.svg Merge branch 'Develop'
first.svg Merge branch 'Develop'
last.svg Merge branch 'Develop'
list.svg Merge branch 'Develop'
list2.svg Merge branch 'Develop'
loop.svg Merge branch 'Develop'
music.svg Merge branch 'Develop'
pause.svg Merge branch 'Develop'
play.svg Merge branch 'Develop'
shuffle.svg Merge branch 'Develop'
volume.svg Merge branch 'Develop'