Fixed merge conflicts
Merge branch 'master' of https://github.com/Aasagi/LumberjackFantasies
Avatar leveling on picked up logs