valtozas2
Merge branch 'master' of https://github.com/em0/QT-ui

Conflicts:
	alma.cpp