import app as json - not finished
Merge branch 'master' of github.com:rabix/registry
import app as json - validation finished
add output modal changes
devel
converting header into sidebar
client changes
cliche as module in client
Merge branch 'devel' of github.com:rabix/registry into pipeline-editor

Conflicts:
	client/app/index.html
	client/app/views/partials/header.html
	client/bower.json