merge everything back from mainline branch
[selectricity-live] / public / images / default_icon.png
public/images/default_icon.png

Benjamin Mako Hill || Want to submit a patch?