pipeline watch fix
Merge branch 'devel' of github.com:rabix/registry into devel

Conflicts:
	client/app/scripts/main/controllers/PipelineEditorCtrl.js
indention problem