content
Changes from my Mac
Merge branch 'master' of https://github.com/carlnjoku/cvdump

Conflicts:
	www/js/controllers.js
	www/js/services.js
	www/templates/playlist.html