Merge branch 'master' of https://github.com/polybassa/YWEE
Merge branch 'master' of https://github.com/polybassa/YWEE
Merge branch 'master' of https://github.com/polybassa/YWEE
Merge branch 'master' of https://github.com/polybassa/YWEE
no message
Merge pull request #103 from Litschi/master

die vorher angekündigten Änderungen
bösen Cookie-Fehler ausgeräumt
Admin-Verwaltung: Gästebucheinträge freigeben
fix bug
Merge pull request #105 from Alabamajack/master

Admin-Verwaltung : Gästebucheintrag freigeben
fix bug
Merge pull request #106 from Alabamajack/master

fix bug
Merge branch 'master' of https://github.com/polybassa/YWEE
Small update
Merge branch 'master' of https://github.com/polybassa/YWEE
Merge remote-tracking branch 'Master/master'
Gästebuch - First Draft for german page
Video und Geolocation hinzugefügt
Merge pull request #107 from FrostbiteDX/master

Gästebuch - Draft for german site
Merge branch 'master' of https://github.com/polybassa/YWEE

Conflicts:
	Site/de/content/gaestebuch.html
	Site/js/guestbook.js
	Site/scripts/ReadGuestbook.php