@bilde2910 fixed all my broken shit
Merge branch 'develop' of https://github.com/Commador/YAMPST into develop

Conflicts:
	src/main/java/com/voxio/yampst/common/StatsManager.java