Update for 1.9.6
Grater now handles conversion to and from BSON
Fix for deserializing a null field in JSON to Double.NaN when model object expects Double
Merge remote-tracking branch 'origin/master' into scala_2.9.x_backport

Conflicts:
	project/SalatBuild.scala