1
gui update
Merge branch 'dev' of https://github.com/okuligowski/ProjektEKG into dev

Conflicts:
	EKG/Views/airecgmain.ui
Merge branch 'dev' of https://github.com/okuligowski/ProjektEKG into dev

Conflicts:
	EKG/Views/airecgmain.ui
gui update
Merge branch 'dev' of https://github.com/okuligowski/ProjektEKG into dev