Image doc
Upgrade Commons Collections to 4.0 and remove deprecated SynchronizedMap
Fix custom serialization
Merge branch 'master' into 1.1.x

Conflicts:
	project/Build.scala