newsbox
Merge branch 'Benny' of https://github.com/LarsBecker/swtp_wett
Merge branch 'master' of https://github.com/LarsBecker/swtp_wett into
Benny

Conflicts:
	soccerPortal/index.php