Merge origin/master

Conflicts:
	AteaAOS/AteaAOS-web/src/main/java/controllerClasses/converters/IndexConverterA.java
	AteaAOS/AteaAOS-web/src/main/java/controllerClasses/special/NewApplication.java
	AteaAOS/AteaAOS-web/src/main/java/controllerClasses/special/UsersToApplications.java
	AteaAOS/AteaAOS-web/src/main/java/entityModels/Applications.java
Merge origin/master

Conflicts:
	AteaAOS/AteaAOS-web/src/main/webapp/secure/applicationUsers.xhtml
Merge origin/master

Conflicts:
	AteaAOS/AteaAOS-web/src/main/webapp/secure/applicationUsers.xhtml
Merge origin/master

Conflicts:
	AteaAOS/AteaAOS-web/src/main/webapp/secure/applicationUsers.xhtml