Updated CHANGES
Renamed implicits for Scala JSON parser
Updated version and changes
Merge branch 'master' into scala-2.11

Conflicts:
	project/project.scala