Neuer Code
Merge branch 'master' of https://github.com/maschood/WorkspaceQNX

Conflicts:
	.metadata/.plugins/org.eclipse.cdt.core/.log