Merge "Adding contacts module" into nyc-mr1-dev