CONN-222: Resolved conflicts with templating changes.
CONN-222: - Resolved behavior conflicts with templating pull.
Merge pull request #20 from mlandis5am/master

CONN-222: WIP - org details form with new/edit states, collapsable sections