Merge branch 'Dev_0.6.1' of newgeom:newgeom.git into BR_TEMP_PLUGIN

Conflicts:
	CMakeLists.txt
	src/Config/plugins.xml

diff --cc src/Config/plugins.xml
index 9dbb286b243e6d523136e93fc26141838cc8c0d0,c763eb5bc6dd8dbf903917f96fa80c54292b9b7f..ab049d554d33504f569517aa758ae710f4de9d45
--- 1/src/Config/plugins.xml
--- 2/src/Config/plugins.xml
+++ b/src/Config/plugins.xml
@@@ -6,8 -6,7 +6,8 @@@
    <plugin library="ConstructionPlugin" configuration="plugin-Construction.xml"/>
    <plugin library="FeaturesPlugin" configuration="plugin-Features.xml"/>
    <plugin library="ExchangePlugin" configuration="plugin-Exchange.xml"/>
 +  <plugin library="TemplatePlugin_1" configuration="plugin-Template_1.xml"/>
    <plugin library="SketchSolver"/>
    <plugin library="GeomValidators"/>
 -  <plugin library="DFBrowser" internal="true"/>
 +  <plugin library="DFBrowser"/>
- </plugins>
+ </plugins>