Sali Domi
Merge branch 'master' of https://github.com/INFOTRONIK14/Project

Conflicts:
	Common/Platform.h