deleted:    .classpath
	deleted:    .project
	deleted:    .settings/org.eclipse.jdt.core.prefs
	modified:   pom.xml
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	avengers/pom.xml
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
  Changes to be committed:
 	new file:   main/java/com/flyhz/avengers/framework/xml/Avengers.java
 	new file:   main/java/com/flyhz/avengers/framework/xml/Domain.java
 	new file:   main/java/com/flyhz/avengers/framework/xml/ObjectFactory.java
 	new file:   main/java/com/flyhz/avengers/framework/xml/package-info.java
 	modified:   main/resources/avengers.xsd
 	deleted:    main/resources/velocity/layout_default.vm
 	deleted:    main/resources/velocity/layout_do_not_use.vm
 	deleted:    main/resources/velocity/macro.vm
 	deleted:    main/resources/velocity/macro_default.vm
 	deleted:    main/resources/velocity/tools.xml
Merge branch 'master' of https://github.com/rememberlostcode/flyhz