MimeTypes fix
Merge branch 'vish' of github.com:ging/social_stream into vish-b3