gitignore bower components
Merge branch 'dev' into feed-nav-style