Merge "New assets. DO NOT MERGE>" into gingerbread