Merge branch 'master' into uidev
add resizable.js
directive.js update
directive.js update
merge uidev -> master