Logs from Server
Merge branch 'master' of https://github.com/Das3nde/EJ-Assets

Merging server data with latest patch