Angular route and templates available
changed project configuration
Merge branch 'develop'
resolved conflict