Fixed send_message bug
Merge branch 'master' of github.com:calvinmm/hack-tx-2013

Conflicts:
	site/js/client.js