update to cdh4
change version
Merge branch 'master' into cdh4
change name
Revert "change name"

This reverts commit eb2debd0565b1ac94e6fbf8519037cdd37d9b307.
Merge branch 'cdh4'

Conflicts:
	pom.xml