don't use global App.store in scaffold
Merge remote-tracking branch 'upstream/master'