Merge branch 'master' of /Users/williamsmendez/Development/Work/RealEstate with conflicts.
Merge remote-tracking branch 'origin/master'
Changed "status" field by "active"