as
Merge branch 'master' of https://github.com/julianogv/smartp

Conflicts:
	solution/SmartPoint.sdf
	solution/point/Visual Micro/Compile.vmps.xml
	solution/point/Visual Micro/Configuration.Debug.vmps.xml
Merge branch 'master' of https://github.com/julianogv/smartp
point