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.png Merge branch 'Develop'
cart.png Merge branch 'Develop'
first.png Merge branch 'Develop'
last.png Merge branch 'Develop'
list.png Merge branch 'Develop'
list2.png Merge branch 'Develop'
loop.png Merge branch 'Develop'
music.png Merge branch 'Develop'
pause.png Merge branch 'Develop'
play.png Merge branch 'Develop'
shuffle.png Merge branch 'Develop'
volume.png Merge branch 'Develop'