fix flickr icon
Merge branch 'master' of github.com:ingwinlu/pelican-bootstrap3

Conflicts:
	templates/includes/sidebar.html