Removed hardcoded logic to serve a "default file".
Marked story as done.
Merge branch 'master' into integration

* master:
  Marked story as done.
  Removed hardcoded logic to serve a "default file".