kernel
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:

	CodificaAritmeticaStatica/CodificaAritmeticaStatica/CodificaAritmeticaStatica.vcxproj