updated picker, added ugly generic json
Merge branch 'master' of https://github.com/objectpartners/petulant-adventure