Pc merge.
Add a Wrapper class and clean the fields api.
Computer sync.
Merge branch 'fieldapi' into dev