change chrome.storage to localStorage
Merge remote-tracking branch 'origin/master'