MaMuT_: annotation key bindings are now read from an editable file.

The viewer navigation key bindings are still hardcoded, though.
And the properties file is stored within the jar, which make it not that
useful.
Signed-off-by: Jean-Yves Tinevez <jean-yves.tinevez@pasteur.fr>
Merge branch 'multiviewtracker' of git://github.com/fiji/fiji into multiviewtracker

Conflicts:
	src-plugins/MaMuT_/src/main/java/fiji/plugin/mamut/MaMuT.java

Signed-off-by: Jean-Yves Tinevez <jean-yves.tinevez@pasteur.fr>