Added app dir
Merge branch 'master' into feature/angular-boilerplate
Added angular into index