Moving checkbox to top.
Merge branch 'feature/940-genericize-addr-settings-ui' of https://github.com/SalesforceFoundation/Cumulus into feature/940-genericize-addr-settings-ui