[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
[feature/controller] Update readme for Board3 Portal 2.1.x

As migrations do not work yet, include instructions for manually
installing it.

B3P-114
[feature/controller] Move main controller to controller directory

A few minor improvements to variables etc. were also added.

B3P-114
[feature/controller] Update readme for correct database changes

B3P-114
[feature/controller] Fix incorrect coding and docblocks in main controller

B3P-114
[feature/controller] Add routing and services files

B3P-114
[feature/controller] Include portal files and fix incorrect variables

B3P-114
[feature/controller] Fix displayal of readme

B3P-114
[feature/controller] Fix missing issues that prevented portal from working

The portal still requires the fix to PHPBB3-11323 in order to work.

B3P-114
Merge branch 'develop-2.1.x' of github.com:board3/Board3-Portal into feature/controller

Conflicts:
	root/portal/modules/portal_user_menu.php
Merge pull request #115 from marc1706/feature/controller

[feature/controller] Make portal work with new controller interface