fixed: new buttons
Merge branch 'master' of https://github.com/nRike/CCola-Hangout