抽象工厂模式
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules/abstract-factory/pom.xml