cleaning shop
Merge branch 'develop' of https://github.com/nirahiel/potential-dangerzone into develop

Conflicts:
	src/main/java/com/nirahiel/potentialdangerzone/common/LogHelper.java
	src/main/java/com/nirahiel/potentialdangerzone/common/NameHelper.java