local
Merge branch 'master' of https://github.com/sankooc/mvn-work

Conflicts:
	algorithm/src/test/java/org/alin/algorithm/ui/GridGraphic.java
migration