Merge origin/master

Conflicts:
	AteaAOS/AteaAOS-web/src/main/java/entityModels/Users.java
Merge origin/master

Conflicts:
	AteaAOS/AteaAOS-web/src/main/java/entityModels/Users.java
Merge origin/master

Conflicts:
	AteaAOS/AteaAOS-web/src/main/java/entityModels/Users.java