Hand-over to HongKee for fixing.
Merge remote-tracking branch 'origin/master' into jni_support

Conflicts:
	ParaMaxFlow/pom.xml
	ParaMaxFlow/src/main/java/com/jug/paramaxflow/gui/ParaMaxFlowPanel.java