Merge branch 'master' of https://github.com/mboldrini/Oscommerce

Conflicts:
	Oscommerce/Properties/Resources.resx
	Oscommerce/frmPrincipal.Designer.cs
Merge branch 'master' of https://github.com/mboldrini/Oscommerce