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

Conflicts:
	kaizen/pom.xml