Updated version number
Updated to use v0.10 type class
Allow parsing of non-object JSON types
Updated to version 0.10.0
Updated to version 1.0.0
Updated version number in source
Merge branch 'master' into scala-2.11

Conflicts:
	project/project.scala