no message
BasicParameterNames
bug fix
Merge branch 'master' of https://github.com/TeamSOC/SOC_Framework into windows

Conflicts:
	SOC/SOC.vcxproj.filters
	SOC/main.cpp
update vcxproj filter
Timer init