New Key-type that might be saved in gae
Make tests pass
Merge remote-tracking branch 'origin/master' into feature/key_rework
Make MashalJSON work again
merged in the key_rework