Merge pull request #637 from joshmoore/bf-common-src

Remove Bio-Formats common directory from eclipse template
Merge pull request #638 from joshmoore/fs-delete-1

_fs_deletelog via triggers
xsd-fu: Move XSLT tests to subdirectory
xsd-fu: Download eggs into egg directory
xsd-fu: Move Genshi into egg directory
xsd-fu: Remove obsolete gen.sh script
xsd-fu: Move python code to python subdirectory
xsd-fu: Use new paths
xsd-fu: Move example.cfg to cfg
Merge pull request #631 from jburel/thumbnails

Handle correctly duplicate thumbnails (see #10225)
repository: Add setuptools-0.6c11-py2.7.egg
xsd-fu: Use /lib/repository directly
All setuptools usage uses /lib/repository
Don't copy setuptools*.egg
OmeroWeb: setup.py needs to import needed modules
OmeroCpp: Add .exe as an executable extension only on Windows
xsd-fu: Move xsltbasic to xslt
Merge pull request #643 from will-moore/channel_name_tweaks

Channel name tweaks (develop)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 587 (Modulo retrieve (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 592 (C++ fixes for building with Ice >= 3.4)