Merge remote-tracking branch 'upstream/master' into nuHamster
Merge pull request #685 from jaypoulz/nuHamster

Renamed some files so that everything is named consistently and removed old logos.
Merge remote-tracking branch 'upstream/master' into jp646