Merge pull request #666 from sbesson/matlab_toolbox_cleanup

Matlab toolbox cleanup
Set javac encoding in Insight child build files.
Fix directory test when cleaning existing Homebrew taps
Merge pull request #639 from will-moore/web-bugs-Jan22nd

Web bugs jan22nd
Add check for working CXX compiler before Ice header check.

This prevents getting a missing Ice.h error when the problem is actually a non working CXX compiler
Don't override CXX if the os env for CXX is empty string
Merge pull request #716 from JesseCorrington/integrate-cpp-fixtures

Integrate cpp fixtures
Merge pull request #737 from snoopycrimecop/merge/dev_4_4/submodules

Update submodules
Add separate check for ice lib so we get better errors
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 558 (Plugin dependencies)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 620 (Spec clean on dev 4 4)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 647 (xsd-fu cleanup (dev_4_4))
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 656 (Merge xsd-fu changes from schema-2012-06 (dev_4_4))
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 729 (unescape UTF-8 literals in Java source code)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 730 (Close resource leak in temporary file manager.)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 739 (Fix directory test when cleaning existing Homebrew taps)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 742 (Cpp build fixes)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 558 jburel 'Plugin dependencies'
  # PR 620 qidane 'Spec clean on dev 4 4'
  # PR 647 rleigh-dundee 'xsd-fu cleanup (dev_4_4)'
  # PR 656 rleigh-dundee 'Merge xsd-fu changes from schema-2012-06 (dev_4_4)'
  # PR 729 mtbc 'unescape UTF-8 literals in Java source code'
  # PR 730 mtbc 'Close resource leak in temporary file manager.'
  # PR 739 sbesson 'Fix directory test when cleaning existing Homebrew taps'
  # PR 742 JesseCorrington 'Cpp build fixes'
Conflicting PRs (not included):
  # PR 740 jburel 'Group view'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 379 sbesson 'Fix source code links moved to the scifio-tools foder'

Repository: ome/scripts
Already up-to-date.
Merged PRs:
  # PR 18 will-moore 'Split view merged 10109'

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 245 mtbc 'Add note about Java UTF-8 source in Insight.'
  # PR 250 mtbc 'Fix code example for log level checking.'
  # PR 251 gusferguson 'Training update'

Generated by OMERO-merge-stable#160 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-stable/160/)