fixed button problem and some work done in gaa tur
Merge branch 'master' of https://github.com/trulsbjo/mmi2