Support watch to be enabled or disabled by pm2 env
Minor change
Merge branch 'develop'