Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:
	extra/spheres/spheres.factor

diff --cc extra/spheres/spheres.factor
index d763e476be89d4325526a5dc1f92af1a97645c50,18e326f1b75d32d8b86fc0c04f1ea01014ea9167..710c953ed104862d0fe741be3937e0efa6c79ef3
--- 1/extra/spheres/spheres.factor
--- 2/extra/spheres/spheres.factor
+++ b/extra/spheres/spheres.factor
@@@ -1,8 -1,7 +1,8 @@@
  USING: kernel opengl opengl.demo-support opengl.gl opengl.textures
  opengl.shaders opengl.framebuffers opengl.capabilities multiline
  ui.gadgets accessors sequences ui.render ui math locals arrays
- generalizations combinators ui.gadgets.worlds method-chains
 -generalizations combinators ui.gadgets.worlds literals ;
++generalizations combinators ui.gadgets.worlds
 +literals ui.pixel-formats ;
  IN: spheres
  
  STRING: plane-vertex-shader