changed manifest + packed new version
fixed merge problems
changed version to 0.25 plus packed new version