# Added Contact Rules and Settings sections in company Edit.
Merge branch 'origin/intelliship_20140105_mp'