Conflict about to happen
Merge branch 'develop' into fix/INF-12323-fix-contact-screen

Conflicts:
	conflict.txt
Merge pull request #5 from ryanwalker/fix/INF-12323-fix-contact-screen

Fix/inf 12323 fix contact screen