changed dataObject to cache and properties object
merge local to remotes and fixed conflicts
merge local branch with remote and fixed conflicts