Solved socketio-file-upload conflict
Authored by: miguelnunes 2014-11-11
Parent(s): [b0b32d]
Child(ren): [d38e17]