Merge branch 'master' into getegui

Conflicts:
	dpx/srxplanargui/help.py
	dpx/srxplanargui/images/01.png
	dpx/srxplanargui/images/02.png
	dpx/srxplanargui/images/03.png
	dpx/srxplanargui/images/04.png
	dpx/srxplanargui/images/05.png
	dpx/srxplanargui/images/06.png
	dpx/srxplanargui/images/07.png
	dpx/srxplanargui/images/08.png
	dpx/srxplanargui/images/09.png
	dpx/srxplanargui/images/10.png
	dpx/srxplanargui/images/11.png
	dpx/srxplanargui/images/12.png
	dpx/srxplanargui/images/13.png
	dpx/srxplanargui/images/14.png
	dpx/srxplanargui/images/15.png
	dpx/srxplanargui/images/16.png
	dpx/srxplanargui/images/17.png
	dpx/srxplanargui/images/18.png
	dpx/srxplanargui/images/19.png
	dpx/srxplanargui/images/20.png
	dpx/srxplanargui/images/21.png
	dpx/srxplanargui/images/22.png

Former-commit-id: 17343a486d392ea39068e97ced1780beeb07dc32

Author: XiaohaoYang

dpx/srxplanargui/help.py

@@ -66,7 +66,7 @@ class SrXguiHelp(HasTraits):
     # quick start
     #######################
 
-    imgs = [ImageResource('%02d.png' % i) for i in range(1, 21)]
+    imgs = [ImageResource('%02d.png' % i) for i in range(1, 23)]
 
     qslen = Int(len(imgs) - 1)