Upgraded to latest JSON4S, and to version 1.0.6
Merge branch 'master' into scala-2.11

Conflicts:
	project/project.scala