Step#6
Merge branch 'master' of https://github.com/MinderArg/RECE-DESA.git

Conflicts:
	ReceUtils/src/main/java/com/minder/conflict/ConflictClass.java
	ReceUtils/src/main/java/com/minder/conflict/Conflictable.java