pull
Merge branch 'master' of https://github.com/nimmicv/YELP

Conflicts:
	kaizen/target/classes/META-INF/maven/kaizen/kaizen/pom.properties
pulling commits
Merge branch 'master' of https://github.com/nimmicv/YELP

Conflicts:
	kaizen/target/classes/META-INF/MANIFEST.MF
	kaizen/target/classes/META-INF/maven/kaizen/kaizen/pom.properties