upped the version to 1.0.4-1
upgraded kryo
Merge branch 'v1.0.4-1' into release-1.0.4

Conflicts:
	apps/pom.xml
	benchmark/pom.xml
	contrib/pom.xml
	demos/pom.xml
	library/pom.xml
	pom.xml
	samples/pom.xml