Merge "Fix for a Resource system bug that displayed the wrong name for missing asset." into gingerbread