Search and delete from playlist user stories working.
Merge branch 'master' of github.com:ECSE428Group/media-stream

Conflicts:
	media-site/client/playlist.js
	media-site/client/video.js
	media-site/client/views/audiogrid.html
	media-site/client/views/picture.html
	media-site/client/views/picturegrid.html
	media-site/client/views/videogrid.html
	media-site/server/main.js