Rename style file
Update ignore files for bower
Merge branch 'develop'