removed mkl library from building on Os X

fixed fit2d 'update' bug

Fixing a bug with background iamge

fixing issues with cif files from AMCSD

remove console output for executables

Merge branch 'hotfix/qt_graphicssystem'

Release 0.2.5

Merge remote-tracking branch 'github/master'

Merge branch 'develop'

Conflicts:
	Dioptas_main/setup.py

Fixed hotfix when calibrating first time images with a different pixe…

…l size then 79um