Fix up the logo directory

* Update logo names and paths -- the program is ImageJ2, not ImageJ.
* Add missing ICNS and ICO flavors for the new logo.
* Add missing README for ImageJ2 v1 logo.
* Update icon paths for ImageJ2 application assembly.

logo/imagej2-v1/readme.txt

@@ -0,0 +1,8 @@
+This directory contains ImageJ2's logos and icons
+from prior to the adoption of its current logo.
+
+The microscope in the logo was based on a photograph of a Bausch + Lomb
+optical microscope from the UW Microscopy Museum collection at LOCI.
+
+The photograph was taken by Johannes Schindelin and Curtis Rueden,
+and reworked into cartoon form by Adam Fraser.

logo/original/readme.txt

@@ -0,0 +1,8 @@
+This directory contains logos and icons for the original ImageJ.
+
+The ImageJ icon is based on a photograph by Tom Grill
+(https://www.tomgrill.com/) of a Hartnack microscope, circa 1870's:
+   http://www.arsmachina.com/s-hart1209.htm
+
+The ImageJ logo (imagej-logo.gif) was created using a macro:
+   https://imagej.nih.gov/ij/macros/MakeImageJLogo.txt

logo/readme.txt

@@ -1,22 +1,16 @@
 This directory contains logos and icons for ImageJ2.
 
-This logo is based on the logo contest winner by Jan Eglinger. The color selection was
-inspired by the logo contest runner-up Dave Williamson.
+This logo is based on the logo contest winner by Jan Eglinger.
+The color selection was inspired by the logo contest runner-up Dave Williamson.
 
-logo_winner.png  - Original winning logo design by Jan Eglinger.
-logo_runner-up.png      - Original runner-up logo design by Dav Williamson.
-image_logo_src.svg      - Source inkscape file used to generate the logo.
-imagej-*-flat.png    - Flat logo scaled to various sizes, with transparency.
-imagej-*-shadow.png    - Drop shadow logo scaled to various sizes, with transparency.
+logo_winner.png    - Original winning logo design by Jan Eglinger.
+logo_runner-up.png - Original runner-up logo design by Dav Williamson.
+ImageJ2.svg        - Source inkscape file used to generate the logo.
+*-flat.png         - Flat logo scaled to various sizes, with transparency.
+*-shadow.png       - Drop shadow logo scaled to various sizes, with transparency.
 
 Also included are several .svg images that contain different examples of how the
 logo could be represented on different backgrounds.
 
-For ImageJ1 logos and icons, see the imagej1 subdirectory.
-
-The original imagej microscope was based on a photograph of a Bausch + Lomb
-optical microscope from the UW Microscopy Museum collection:
-   http://loci.wisc.edu/outreach/uw-microscopy-museum
-
-The photograph was taken by Johannes Schindelin and Curtis Rueden,
-and reworked into cartoon form by Adam Fraser.
+For the original ImageJ's logos and icons, see the original subdirectory.
+For the first version of the ImageJ2 logo, see the imagej2-v1 subdirectory.

src/main/assembly/application.xml

@@ -67,18 +67,18 @@
 
 		<!-- Include the ImageJ2 icon in the Mac OS X application bundle. -->
 		<file>
-			<source>${basedir}/logo/ImageJ.icns</source>
+			<source>${basedir}/logo/ImageJ2.icns</source>
 			<outputDirectory>/Contents/Resources/</outputDirectory>
 		</file>
 
 		<!-- Use the ImageJ2 logo for the splash screen. -->
 		<file>
-			<source>${basedir}/logo/imagej.png</source>
+			<source>${basedir}/logo/256x256-shadow.png</source>
 			<outputDirectory>/images/</outputDirectory>
 			<destName>icon.png</destName>
 		</file>
 		<file>
-			<source>${basedir}/logo/imagej.png</source>
+			<source>${basedir}/logo/256x256-flat.png</source>
 			<outputDirectory>/images/</outputDirectory>
 			<destName>icon-flat.png</destName>
 		</file>