Merge origin/masterRemote into masterRemote

Conflicts:
	src/java/pt/altran/altranreq/manager/ClientController.java
	src/java/pt/altran/altranreq/services/FunctionalRequirementServiceImp.java
Merge origin/masterRemote into masterRemote

Conflicts:
	src/java/pt/altran/altranreq/manager/ClientController.java
	src/java/pt/altran/altranreq/services/FunctionalRequirementServiceImp.java
Merge origin/masterRemote into masterRemote