Adding ContactView
Merging changes
Merge remote-tracking branch 'origin/refactor' into refactor

Merging changes.