merge develop manually

without readme and icon