Moving most of the integration section to the relevant user and admin sections; fixes #1163
Merge pull request #1182 from vdeparday/master

Moving most of the integration section to the relevant user and admin se...