Set content-type for static resources and templates
Merge branch 'master' of github.com:Vinnovera/estrad

Conflicts:
	package.json