DevYah/smartsoft-14 — pull request #322 by aaeabdo (2014-05-14 06:50:42+00:00)
Title: #155 #257  Resolving conflict in members controller

#155 #257 @osherifo