Merge https://github.com/Danch0/SGAP into AlmacenDev

Conflicts:
	SGAP/SGAP.csproj
Merge branch 'develop' of https://github.com/Danch0/SGAP into develop