Merge branch 'master' of https://github.com/juliohm/ar2tech-SGeMS-public into juliohm-master

Conflicts:
	.gitignore
	ar2gems/actions/actions.vcxproj
	ar2gems/appli/appli.vcxproj
	ar2gems/appli/appli.vcxproj.filters
	ar2gems/charts/charts.vcxproj
	ar2gems/charts/charts.vcxproj.filters
	ar2gems/charts/log_data_chart.cpp
	ar2gems/filters/filters.vcxproj
	ar2gems/geostat/geostat.vcxproj
	ar2gems/grid/grid.vcxproj
	ar2gems/grid/grid.vcxproj.filters
	ar2gems/gui/gui.vcxproj
	ar2gems/gui/gui.vcxproj.filters
	ar2gems/main/main.vcxproj
	ar2gems/main/main.vcxproj.filters
	ar2gems/main_com/main_com.vcxproj
	ar2gems/main_com/main_com.vcxproj.filters
	ar2gems/math/math.vcxproj
	ar2gems/qtplugins/qtplugins.vcxproj
	ar2gems/qtplugins/qtplugins.vcxproj.filters
	ar2gems/utils/utils.vcxproj
	ar2gems/utils/utils.vcxproj.filters
	ar2gems/widget_accessor/extragui.vcxproj
partial merge; need to recover visual studio project
modified included path
 added visual studio project back to folder
Fixed visual studio project files
Added back the visual studio project files

The visual studio project file were added back for now.  The short term
goal is to move all build (linux and windows) to cmake.
visual studio files  continued