Merge branch 'develop' into nonGPL

Conflicts:
	diffpy/srxplanar/loadimage.py

Author: XiaohaoYang

diffpy/srxplanar/loadimage.py

@@ -20,7 +20,7 @@
 import sys
 from diffpy.srxplanar.srxplanarconfig import _configPropertyR
 import tifffile
-import tifffile.imsave as saveImage
+from tifffile import imsave as saveImage
 import subprocess
 import numpy as np