Added better watch support handling.
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #352 from dshurt/master

Master