Merge origin/master

Conflicts:
	AteaAOS/AteaAOS-web/src/main/java/controllerClasses/special/newProject.java
	AteaAOS/AteaAOS-web/src/main/webapp/secure/GroupsUsers.xhtml
	AteaAOS/AteaAOS-web/src/main/webapp/secure/newProjectDetails.xhtml
Merge origin/master