Fix sub-organization edit link display
Merge pull request #33 from thelabtech/MH-536

Fix sub-organization edit link display
Hide some pre-defined questions in Add Contact form using attribute_name
Fix conflicts after merging MH-435 to dev