Merge "new SaveTag activity, additional utilities" into gingerbread