post activity edit
Merge branch 'feature/man2' of https://github.com/Ganco/KNU_Market into feature/man4