Some updates
Merge branch 'master' of https://github.com/ianvanwijk/Wet-Cat

Conflicts:
	src/Wet-Cat_Image_Processing/Acquirer/simpleacquirer.cpp
	src/Wet-Cat_Image_Processing/Wet-Cat_Image_Processing.pro.user