Adding callback for failed connection
Merge remote-tracking branch 'origin/stable'

Conflicts:
	.gitignore
	server.js
resetting invite page since its not working right on Android
Merge remote-tracking branch 'origin/master' into stable