#155 #257  Resolving conflict in members controller
Merge pull request #322 from DevYah/T4_Ahmed_4.1

#155 #257  Resolving conflict in members controller