Fixes #163 Add 'key' and 'value' attribute on @JSON annotation for collections & map support