Merge branch 'next' into gtk

Merge branch 'next' into gtk

Conflicts:
	configure.ac
	gui/Makefile.am
	gui/hkl-gui-3d.cpp
	gui/hkl-gui-3d.h
	gui/hkl-gui-callbacks.cpp
	gui/hkl-gui-modelcolumns.h
	gui/hkl-gui-pseudoaxes.cpp
	gui/hkl-gui-pseudoaxes.h
	gui/hkl-gui.cpp
	gui/hkl-gui.h
	gui/hkl3d/hkl3d-gui-model.cpp
	gui/hkl3d/hkl3d-gui-model.h
	gui/hkl3d/hkl3d-gui-scene.cpp
	gui/hkl3d/hkl3d-gui-scene.h
	gui/hkl3d/hkl3d-gui-view.cpp
	gui/hkl3d/hkl3d-gui-view.h
	gui/trackball.vapi
	hkl3d/bullet/src/Makefile.am
	hkl3d/hkl3d.cpp
	hkl3d/hkl3d.h
	test/hkl/axis-t.c
	test/hkl/lattice-t.c
	test/hkl/pseudoaxis-e4cv-t.c
	test/hkl/pseudoaxis-e6c-t.c
	test/hkl/pseudoaxis-k4cv-t.c
	test/hkl/pseudoaxis-k6c-t.c
	test/hkl/pseudoaxis-t.c
	test/hkl/sample-t.c
	tests/hkl-geometry-t.c
	tests/hkl-parameter-t.c
	tests/hkl-vector-t.c
	tests/runtests.c
	tests/tap/basic.c
	tests/tap/basic.h
	tests/tap/libtap.sh