Requisitos Funcionais concluidos
Requisitos Funcionais concluidos
Merge commit 'ac48035fd698bd29759af4ec15c44e9e1f973f65' into masterRemote

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/java/pt/altran/altranreq/manager/FunctionalRequirementController.java
	web/admin/businessCategory/Create.xhtml
	web/admin/businessCategory/Edit.xhtml
	web/admin/businessCategory/List.xhtml
	web/admin/businessCategory/index.xhtml
	web/project/functionalRequirement/View_New.xhtml