updates decks api
Merge branch 'zo' into gmerge