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

Conflicts:
	kaizen/src/main/resources/com/kaizen/yelp/ui/views/home.mustache
	kaizen/target/classes/META-INF/maven/kaizen/kaizen/pom.properties
	kaizen/target/classes/com/kaizen/yelp/api/KaizenResource.class
	kaizen/target/classes/com/kaizen/yelp/ui/views/home.mustache