Merge pull request #1 from mivano/develop

Changed datastore to actual save and retrieve items.
Merge pull request #2 from mivano/develop

Changed field data
Fixed the sample app with a working workflow.
Small changes
Merge branch 'lnaie-master'
Merge branch 'master' into develop