fixed a bug in local storage logic
changed autosave time to 5 secs
Merge branch 'master' into develop-chris