update style
Merge branch 'master' of https://github.com/dj1983/angular-app-ns into dj1983-master
Merge branch 'dj1983-master'
merge ui design