merge code!
Merge branch 'master' of https://github.com/zdtwyjp/my-library.git

Conflicts:
	my-library-parent/my-library-supermap/target/m2e-wtp/web-resources/META-INF/maven/my-library-parent/my-library-supermap/pom.properties