编辑about 111111
添加oms
添加crm
Merge branch 'develop' of github.com:dellheng/maven_demo into develop

Conflicts:
	about.txt
添加Maven JGit-Flow Plugin
updating poms for branch '0.0.1' with snapshot versions
updating poms for 0.0.2-SNAPSHOT development
updating poms for branch'release/0.0.1' with non-snapshot versions
Merge branch 'release/0.0.1'
updating develop poms to master versions to avoid merge conflicts
Merge branch 'master' into develop
Updating develop poms back to pre merge state
updating poms for 0.0.3-SNAPSHOT development
updating poms for branch'release/0.0.2' with non-snapshot versions
Merge branch 'release/0.0.2'
updating develop poms to master versions to avoid merge conflicts
Merge branch 'master' into develop
Updating develop poms back to pre merge state
updating poms for branch'release/0.0.3' with non-snapshot versions
Merge branch 'release/0.0.3'