minor commit
Merge branch 'master' of github.com:seyuf/metroMapping_graphAlgo_java

Conflicts:
	target/classes/META-INF/maven/Graph/Graph/pom.properties
	target/classes/algo/graph/graphic/MainPage$1.class
ckecking conflicts javadoc