final modif
Merge branch 'master' of https://github.com/anetaaneta/kupakupa
Merge branch 'master' of https://github.com/anetaaneta/kupakupa
Merge branch 'master' of https://github.com/anetaaneta/kupakupa
some fix on GUI
Merge branch 'master' of https://github.com/anetaaneta/kupakupa