even more client side code added
Merge branch 'master' of github.com:bcleenders/chatmate
even more client side code added