fix buttons
Merge branch 'develop' of https://github.com/samsao/WearhacksMTL2014 into develop