Update playlist, Add search
Merge remote-tracking branch 'origin/master'

Conflicts:
	web-server/Root.py