Added Angular stuffs
Merge branch 'ui'