Merge origin/master

Conflicts:
	MayoristasNicas_1stVersion/web/index.jsp
	MayoristasNicas_1stVersion/web/viewProducts_.jsp