Added the audio resource playlist
Added the audio playlist functionality again
Merge branch 'master' of https://github.com/stoe/hackathon13

Conflicts:
	web/app/controller/Main.js
	web/app/view/Viewport.js