working on store
Merge remote-tracking branch 'upstream/master'
wip of new wizard
mark with comment
Merge pull request #1666 from diegosarmentero/master

wip of new wizard project
Merge remote-tracking branch 'upstream/master' into syntactic