fix notice
Merge branch 'develop' of github.com:ec3s/angular-adminui into feature/taskNotice

Conflicts:
	app/scripts/directives/ntd-ui-directive.js
fix notice
fix notice
fix
Merge branch 'develop' into feature/taskNotice
fix notice
Merge branch 'feature/taskNotice' of github.com:ec3s/angular-adminui into feature/taskNotice
Merge branch 'feature/taskNotice' into develop