Conflicts:
	lib/diaspora/shareable.rb

changed handlebars "avatar" helper to "personImage"; added home button to interaction pane (only when sneaky -- needs further investigating on getting it showing up when the interaction pane is invoked); minor css tweaks.

Revert "don't show nsfw posts without a shield in the viewer"

This reverts commit 722116ce.

Fix positioning in message pane timestamps. [ci skip]

fix css for searchbox (fixes #2878)[ci skip]

adapt host-meta document to RFC 6415

Add spacing between paragraphs and dots before items in an unordered lis...[ci skip]

introduce the idea of Federated::Base. this is mostly just renaming and collasping of different federation modules, but also starting a direct hiearchy of these federation classes to make everything easier to refactor

Fix atom feed bug (bug mash 7) [ci skip]

Users controller small fix; removed the to_activity method and the corresponding tests for status_message model

make sneaky passive by default.  this fixes the bug where a user would like something when the interaction pane is active and the sneaky would show up when the feedback view was re-rendered.

don't render page-viewer twice; last_post should actually get the last post posted, not the first one

fix facebook finder [ci-skip]

phasing out app.user() for app.currentUser