added serving of several mime types
Merge branch 'development'