#4366
Merge u*v for 2D/3D

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@34621 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
fix for showFormulaBar="true"true"

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