for merge
pom
study pom
fjdfjkj
Merge branch 'master' of https://github.com/fifa016/study

Conflicts:
	droolsWithMaven/pom.xml