Merge "Adding new assets for designers" into gingerbread