updated bower ignores
Merge branch 'dev'