Angular directive
Merge remote-tracking branch 'origin/master'

Conflicts:
	ExtReg.Web/Scripts/Local/app.js