Merge remote-tracking branch 'origin/master' into track-mate
Conflicts:
.mailmap
README.md
plugins/Scripts/File/Make_Screencast.bsh
pom.xml
src-plugins/SPIM_Registration/src/main/java/mpicbg/spim/fusion/MappingFusionSequentialDifferentOutput.java
src-plugins/SPIM_Registration/src/main/java/mpicbg/spim/registration/ViewDataBeads.java
src-plugins/fiji-compat/src/main/java/fiji/User_Plugins.java
Signed-off-by: Jean-Yves Tinevez <jean-yves.tinevez@pasteur.fr>