Rewrite SERVER['REMOTE_ADDR'] when behind load balancer
Revert "Rewrite SERVER['REMOTE_ADDR'] when behind load balancer"

This reverts commit e8e9bc4c575fd10557304dbc2dcb418fcf104627.
Set correct name in config ini
better way of getting LatLong
Merge branch '2.1' into 3.0

Conflicts:
	Vps_js/Form/GoogleMapWindow.js
Merge branch '3.0' into 3.1
Merge branch '3.1' into 3.2
fixed the map for fitting to the view

the map fits now to the view if more marker are set
Add support for resetMaster
Fix resetMaster support
port to new google api
git check fixed
google library places added
Adapt Config for daniel
improve detectMimeType for docx files

in case an application/zip file is detected try again with libmagic 5.11 magic data.
this fixes detecting docx files on debian servers

Conflicts:
	config.ini
Merge branch '1.8' into 1.9

Conflicts:
	config.ini
Merge branch '1.9' into 1.11
Merge branch '1.11' into 2.0

Conflicts:
	Vps/Component/Output/Master.php
	Vps/Uploads/Row.php
Merge branch '2.0' into 2.1

Conflicts:
	config.ini
Merge remote-tracking branch 'origin/2.1' into 3.0

Conflicts:
	Kwf/Controller/Action/User/LoginController.php
	config.ini