switch to new registry
Merge branch 'contra:master' into plugins:master

Conflicts:
	app/js/directive/showhover.js