Conflicts:
	app/assets/javascripts/app/views/stream_view.js

/cc @joshsusser @groupon @dhh

silence asset noise in development.  Thanks to @joshsusser. @denniscollective said I should put something pithy here, but that sounds like a bad idea.

change naming a bit to be more general since its posts+photos now
(re #3158)

closes #3106 - hardening url handling,
fixes #2725 - backport from upstream

include an iframe route, for posts, and a magic body padding removal for screens with small widths (for some reason, smaller than 770

streamView no longer abuses render with fetching
moved post collapsing into contentView
subtle nicification.

Updated the Galician translation.

Issue #3134:Problem with translation in authorizations/new.html.haml

Refactor application.yml.example [ci skip]

use rails admin gem, not the smaller git repo.  NOTE: I will delete diaspora/rails_admin_smaller in about a week to let people who pulled it get off of it

This reverts commit f7d1f0d9.