Merge remote branch 'remotes/psychlopssilverlight/master'

Conflicts:
	dev4/Shader/GaborAlpha.ps
	test4/PsychlopsMain.cs

diff --cc test4/PsychlopsMain.cs
index fe1a13a,4cfe448..7a79979
--- 1/test4/PsychlopsMain.cs
--- 2/test4/PsychlopsMain.cs
+++ b/test4/PsychlopsMain.cs
@@@ -572,7 -257,7 +572,11 @@@ namespace PsychlopsSilverlightAp
              img2 = new Image(isize * 2, isize * 2);\r
              img3 = new Image(isize * 2, isize * 2);\r
  \r
++<<<<<<< HEAD
 +                      var gabor1 = StaticFunctions.NewArray<Figures.ShaderGabor>(100);\r
++=======
+                       var gabor1 = StaticFunctions.NewArray<Figures.ShaderGaborAlpha>(100);\r
++>>>>>>> remotes/psychlopssilverlight/master
                        foreach(var g in gabor1)\r
                        {\r
                                g.setSigma(isize / 8).centering().shift(Math.random(300) - 150, Math.random(600) - 300);\r