update commit
Merge branch 'master' of https://github.com/mdoing2001/mahout.git

Conflicts:
	pom.xml