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


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

Conflicts:
	jimlgx-codeagile-generate/src/main/java/org/jimlgx/codeagile/parse/xml/XmlProjectParse.java


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


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


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