send files direct by the server
empty sockets dir
Merge branch 'master' into develop

* master:
  empty sockets dir
  send files direct by the server
Merge branch 'develop' into rails4

* develop:
  empty sockets dir
  send files direct by the server