Display link to a user's blog if they have one connected.

Previously there was no way to see a specific user's blog posts if they had a blog connected. Refactored the code a little in the decorator regarding displaying the blog section on a user profile.
Merge master into development and fix conflicts.

Merge branch 'master' into development

Conflicts:
	app/decorators/user_decorator.rb
	app/views/users/show.html.haml