commit
Merge branch 'master' of https://github.com/vitormota/SINF-2013_2014

Conflicts:
	ERP_webservice/bin/ERP_webservice.dll
	ERP_webservice/bin/ERP_webservice.pdb
	ERP_webservice/obj/Debug/ERP_webservice.dll
	ERP_webservice/obj/Debug/ERP_webservice.pdb