Merge remote-tracking branch 'origin/master'

Conflicts:
	TP/Aplicacion Desktop/FrbaCommerce/FrbaCommerce/Principal.cs