Making a null watcher as default.
Merge remote-tracking branch 'refs/remotes/origin/WatcherFix' into Watcher2

Conflicts:
	install/project/includes/controls/QWatcher.class.php