fix flickr-icon
Merge pull request #103 from ingwinlu/social_icon_fix

fix flickr-icon
Fix spaces in social class in sidebar.html
Upgrade font-awesome.css and add exception for stack overflow in sidebar.html
Merge pull request #106 from Woodham/master

Fix spaces in social class in sidebar.html
Merge remote-tracking branch 'upstream/master'

Conflicts:
	templates/includes/sidebar.html