minor alignment fix
Merge pull request #2578 from awesomerobot/master

minor alignment fix on embedded posts
FIX: don't show broken button
FEATURE: allow advanced badge options in admin screen

clean up serializer, allow simplistic preview
FIX: typo
FIX: If you hit back while a `replaceState` was queued up it would
update the URL even after navigating.
FIX: When we don't have an `uploaded_avatar_id` don't try to show the
avatar. Wait until it's loaded.
adding border to poster expansion, changing media screen to media all, trying new notification style
FIX: filter whitelist domain name
FIX: Direct links to hash URLS were broken. Regression?
FIX: Link a poster's name to their profile, makes much more sense now
that we're showing the popup to that.
FIX: Clicking navigation pills a second time should refresh the list
you're looking at.
Make a mocked test that broke pending for now. The logic works, will
replace with a new test later.
Merge pull request #2580 from techAPJ/patch-4

FIX: filter whitelist domain
FIX: Use placeholder for avatar image size in expansion
FIX: remove invalid hack, correct whitelist to use value returned from callback
SECURITY: fix XSS in excerpt parser
PERF: move avg time calculation to daily
Merge remote-tracking branch 'upstream/master'
FIX: do not store incoming links on avatars or uploads