fix bug
Merge branch 'testing' of http://github.com/WizTeam/WizQTClient into testing
extra button