Merge branch 'master' of https://github.com/JSorella/j2la-tp

Conflicts:
	src/FrbaCommerce.suo
	src/FrbaCommerce/bin/Debug/FrbaCommerce.exe
	src/FrbaCommerce/bin/Debug/FrbaCommerce.pdb
	src/FrbaCommerce/obj/Debug/FrbaCommerce.csproj.GenerateResource.Cache
	src/FrbaCommerce/obj/Debug/FrbaCommerce.exe
	src/FrbaCommerce/obj/Debug/FrbaCommerce.pdb
Revert "Merge branch 'master' of https://github.com/JSorella/j2la-tp"

This reverts commit ee02e069e031c37bc6933edf9b4dd38afcea8d1b.