C3 mahmoud hashish #235 facebook comments

@marwa-mehanna @Dayna161193 @muhammedabuali @omar-kassem please review this branch to be merged to master