Close #14 Basecamp
Merge branch 'refs/heads/master' into Phase2
Add dock to mime types. Close #17 Basecamp