Updated readme.
Updated persistance and datasources.
Merge branch 'feature/fix_name' into develop