added timeout mechanism client side
merge resolved
Merge branch 'master' of https://github.com/heierj/ChatterSpot
realtime messaging!!!!
Merge branch 'master' of https://github.com/heierj/ChatterSpot