Conflicts:
	lib/private/vcategories.php

revert changes to fbbc76f2 because master is very unstable right now

This is for all LowerCaseConstant warnings

use socket timeout of 10 sec to stay responsive even with a slow internet connection or a not working server

Show the different editions to the user. Used in the status call, on the personal settings page and in the updater to update to the next available version from the same edition.

This way the config.php file is not changed every time you go to the
personal page. Step to make it possible to have a read-only config.php
most of the time

At the moment we only have a hint that a new version is avaiable and a link to a not yet existing page if updating information. This has to be improved.