.
Merge remote-tracking branch 'origin/2.0' into 2.0
添加忽略
.
Merge remote-tracking branch 'origin/2.0' into 2.0

Conflicts:
	koala-bpm/.gitignore
	koala-gqc/.gitignore
	koala-gqc/koala-gqc-application/.gitignore
	koala-gqc/koala-gqc-applicationImpl/.gitignore
	koala-gqc/koala-gqc-conf/.gitignore
	koala-gqc/koala-gqc-controller/.gitignore
	koala-gqc/koala-gqc-core/.gitignore
	koala-gqc/koala-gqc-infra/.gitignore
	koala-gqc/koala-gqc-web/.gitignore
	koala-plugin/.gitignore
	koala-plugin/koala-plugin-create/.gitignore
	koala-plugin/koala-plugin-curd/.gitignore
	koala-plugin/koala-plugin-db2entity/.gitignore
	koala-plugin/koala-plugin-ejb/.gitignore
	koala-plugin/koala-plugin-util-core/.gitignore
	koala-plugin/koala-plugin-webservice/.gitignore
..
Merge remote-tracking branch 'origin/2.0' into 2.0
update changes