Regressionstest
test
Merge branch 'master' of https://github.com/maschood/WorkspaceQNX

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/SE2P.1366094374145.pdom
	.metadata/.plugins/org.eclipse.core.resources/.projects/SE2P/.indexes/properties.index