add trl for erich
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
Merge branch '3.2' into 3.3
Merge branch '3.3' into 3.4
Merge branch '3.4' into 3.5

Conflicts:
	trl.xml
fixed the trl conflict from previous commit
Merge remote-tracking branch 'github/3.5' into 3.5
Duplicate editableItems on basis of filename

Regarding concern on 194cc3a5b0f112856710c7869cff311d4e73e666
renamed order var correctly for invoicePdf in shop
Force Opt-Component to reload page when submitting
styling for 3.5