Signed-off-by: jimlgx <jimlgx@gmail.com>
Merge remote-tracking branch 'origin/master' into working


Signed-off-by: jimlgx <jimlgx@gmail.com>


Signed-off-by: jimlgx <jimlgx@gmail.com>
add XmlProjectParse
Merge remote-tracking branch 'origin/master' into working

Conflicts:
	jimlgx-codeagile-generate/src/main/java/org/jimlgx/codeagile/generate/Bootstrap.java
	jimlgx-codeagile-generate/src/main/java/org/jimlgx/codeagile/generate/model/FileModel.java
	jimlgx-codeagile-generate/src/main/java/org/jimlgx/codeagile/generate/model/Folder.java
	jimlgx-codeagile-generate/src/main/java/org/jimlgx/codeagile/generate/model/MavenProject.java
	jimlgx-codeagile-generate/src/main/java/org/jimlgx/codeagile/generate/model/SourceFolder.java
	jimlgx-codeagile-generate/src/main/java/org/jimlgx/codeagile/parse/ParseUtils.java
	jimlgx-codeagile-generate/src/main/java/org/jimlgx/codeagile/parse/xml/XmlDomainParse.java
	jimlgx-codeagile-generate/src/main/java/org/jimlgx/codeagile/parse/xml/XmlProjectParse.java
	jimlgx-codeagile-generate/src/test/java/org/jimlgx/codeagile/generate/model/MavenProjectTest.java
	jimlgx-codeagile-generate/src/test/java/org/jimlgx/codeagile/parse/xml/XmlDomainParseTest.java
	jimlgx-codeagile-generate/src/test/java/org/jimlgx/codeagile/parse/xml/XmlProjectParseTest.java


Signed-off-by: jimlgx <jimlgx@gmail.com>
Merge remote-tracking branch 'origin/working'