Grabbed some changes made during mobadroid development.
Made Champion (and associated types) parcelable.
Fixed some deserializers that crashed.
Merge remote-tracking branch 'origin/master'