Fix the lock for EV axes ratio

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@36005 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Add simplify to TrigCombine

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@36006 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Add normal rather than simplify to TrigCombine

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