set version to 0.3.1-cdh5-SNAPSHOT
Merge branch 'master' into cdh5

Conflicts:
	build.sbt
	src/main/scala/scamr/Version.scala
Merge branch 'master' into cdh5

Conflicts:
	build.sbt
	src/main/scala/scamr/Version.scala