Merge branch 'master' of heroku.com:pangea-webchat
fix again..