fIX iaRMOURiMPL ERROR
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	src/main/java/com/relicum/scb/classes/utils/IArmourImpl.java
fIX iaRMOURiMPL ERROR