Comit
Merge branch 'master' of github.com:oOthkOo/supervizer

Conflicts:
	package.json
Watch feature fix.