Pull Request: C2_Atef_269_Edit_Post_1.18

This can't be reviewed unless the add post is in the master