renamed trunk folder to touch


git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@23961 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
CanvasMath: formula string did not contain colors, so colors had to be added manually (due to a bug even if the colors were OK in other cases)

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@23962 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e