Merge origin/master

Conflicts:
	src/test/java/org/mesol/spmes/EquipmentTest.java
Merge origin/master

Conflicts:
	src/test/java/org/mesol/spmes/EquipmentTest.java
Merge origin/master

Conflicts:
	src/main/java/org/mesol/spmes/controller/AuthController.java
	src/main/java/org/mesol/spmes/model/factory/EquipmentClass.java
	src/main/java/org/mesol/spmes/model/security/User.java