競合解決のためコミット
Merge remote-tracking branch 'origin/master'

Conflicts:
	flowdiff/bin/ocha/itolab/flowdiff/applet/flowdiff/Drawer.class
	flowdiff/bin/ocha/itolab/flowdiff/core/data/Grid.class
	flowdiff/src/ocha/itolab/flowdiff/applet/flowdiff/Drawer.java
	flowdiff/src/ocha/itolab/flowdiff/util/CriticalPointFinder.java