parallel2
Merge origin/final

Conflicts:
	src/main/java/ProcessCheck.java