Commit from PC Eclipse DP4 C++ project.
Merge branch 'master' of https://github.com/aldgoff/DP4

Conflicts:
	DP4/src/DP4.cpp