Migrated to Scala 2.10

All the tests are passing.
I've also made deserialisation of Either to try more specific type first.

Has been tested with our project at Zeebox.