almost completed
Merge branch 'develop' into refactoring_placing_and_edit_advertisement
worked fine