trlalalala..
Merge branch 'master' of https://github.com/anetaaneta/kupakupa

Conflicts:
	kupa-gui-2/kupa-gui-2.pro.user
	kupa-gui-2/kupagui.ui.autosave
Merge branch 'master' of https://github.com/anetaaneta/kupakupa

Conflicts:
	kupa-gui-2/kupa-gui-2.pro.user