Agent
Merge branch 'master' of https://github.com/davidpflugpeil/BounceBird

Conflicts:
	Webseite/index.php
Merge branch 'master' of https://github.com/davidpflugpeil/BounceBird