22/6 bug fix
22/6 bug fix + clean manifest + delete NihtaftiActivity