Merge remote-tracking branch 'remotes/origin/TestBranch'

Conflicts:
	SE2P/main.cpp
Merge branch 'master' of https://github.com/maschood/WorkspaceQNX

Conflicts:
	SE2P/main.cpp