remove shapado and getsatisfaction

Add extra bit to ensure fixedness for #2951

take url shortening into effect before truncating twitter posts

Fix photo uploader, kill breakage #2951 [ci skip]

Conversations should return json #2833

update aspect name in aspects listing after editing.

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]