MC1.6 Migration
Refactored asset location
Merge branch 'master' into MC1.6