expressions - part 1
Merge branch 'master' of github.com:rabix/registry

Conflicts:
	cliche/app/scripts/directives/codemirror.js
	cliche/app/styles/main.css
expressions - part 2
Merge branch 'master' of github.com:rabix/registry