Merge "cleanup unused classes, show date in tag list." into gingerbread