adding small bower_components
updating content
manual merge from gh-pages conflic