Updated version
Updated version in Readme
Merge branch 'master' into scala-2.11

Conflicts:
	README.md
	project/project.scala