#14 - My last update in code - goodbye!
Merge branch 'dev' of https://github.com/okuligowski/ProjektEKG into MVC

Conflicts:
	EKG/Controllers/appcontroller.cpp