[cleanup/tabs] Remove unnecessary tabbing in portal files
Merge branch 'master' of github.com:board3/Board3-Portal into cleanup/tabs

Conflicts:
	root/includes/acp/acp_portal.php
	root/language/de/mods/info_acp_portal.php
	root/language/en/mods/info_acp_portal.php
Merge pull request #109 from marc1706/cleanup/tabs

[cleanup/tabs] Remove unnecessary tabbing in portal files
[cleanup/whitespace] Get rid of unnecessary whitespace
Merge pull request #110 from marc1706/cleanup/whitespace

[cleanup/whitespace] Get rid of unnecessary whitespace
Merge remote-tracking branch 'origin' into develop-2.1.x

Conflicts:
	root/portal/includes/functions_upload.php
Merge branch 'develop-2.1.x' of github.com:board3/Board3-Portal into feature/controller

Conflicts:
	root/portal/modules/portal_user_menu.php