Add local storage folder
Merge branch 'users' into develop