ignores
Merge branch 'dev'
setup assets pippeline and angular-require