directive.js update
Merge remote-tracking branch 'origin/uidev'