Merge branch 'master' of https://github.com/MayoristasNicas/Mayoristasproject

Conflicts:
	MayoristasNicas_1stVersion/nbproject/private/private.xml
.