Merge remote-tracking branch 'biomimetics/master' into imageproc2.5-integration

Conflicts:
	spi_controller.c
Merge remote-tracking branch 'biomimetics/imageproc2.5-integration' into imageproc2.5-integration

Conflicts:
	spi_controller.c
Merge branch 'imageproc2.5-integration' of github.com:biomimetics/imageproc-lib into imageproc2.5-integration