renamed _assets to assets... lets see if this is the problem
mergeing
Merge branch 'master' into debug