parse different media types
Merge branch 'master' of https://github.com/pszjmb1/dossier

Conflicts:
	client/views/media.js
	server/fixtures.js