Merge branch 'development'
Merge remote-tracking branch 'origin/development'
Added angular js
Merge branch 'master' into development