Merge branch 'master' of https://github.com/catia92/SO_1314V_Series

Conflicts:
	Serie1_SO_1314V/Serie1_SO_1314V/Serie1_SO_1314V.vcxproj