Serving media files in debug mode
Ignoring .DS_Store
Merge branch 'master' into dashboard