making the phone html upload ajaxily and then send the info back through the socket
Merge branch 'master' of https://github.com/liyanchang/node

Conflicts:
	server.js