Merge branch 'master' of github.com:joliva/chatspot-web