Merge branch 'stable' into develop

.gitignore

@@ -40,6 +40,7 @@ public/500.html
 
 # Sprites
 app/assets/images/branding-*.png
+app/assets/images/branding/logos-*.png
 app/assets/images/icons-*.png
 app/assets/images/social_media_logos-*.png
 

COPYRIGHT

@@ -21,3 +21,8 @@ exception to your version of the file(s), but you are not obligated to
 do so.  If you do not wish to do so, delete this exception statement from your
 version.  If you delete this exception statement from all source files in the
 program, then also delete it here.
+
+Social Media Icons
+------------------
+Some icons are used from https://github.com/paulrobertlloyd/socialmediaicons
+Licensed under a Creative Commons Attribution-Share Alike 3.0 license

Changelog.md

@@ -35,6 +35,7 @@ Ruby 2.0 is no longer officially supported.
 * Improve the logging of Eyes output [#5989](https://github.com/diaspora/diaspora/pull/5989)
 * Gracefully handle XML parse errors within federation [#5991](https://github.com/diaspora/diaspora/pull/5991)
 * Remove zip-zip workaround gem [#6001](https://github.com/diaspora/diaspora/pull/6001)
+* Cleanup and reorganize image assets [#6004](https://github.com/diaspora/diaspora/pull/6004)
 
 ## Bug fixes
 * Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846)