Merge branch 'master' of http://github.com/SteffenKrohn/Bugenbook into ubuntu-server

Conflicts:
	class/ContentTimeline.php
	config/config.php

Signed-off-by: SteffenKrohn <krohn.steffen@t-online.de>
Signed-off-by: SteffenKrohn <krohn.steffen@t-online.de>
Server v1.01

Signed-off-by: SteffenKrohn <krohn.steffen@t-online.de>
v1.04

System-Nachrichten Anzeige
Signed-off-by: SteffenKrohn <krohn.steffen@t-online.de>
Merge branch 'ubuntu-server' of https://github.com/SteffenKrohn/Bugenbook
Signed-off-by: SteffenKrohn <krohn.steffen@t-online.de>
Signed-off-by: SteffenKrohn <krohn.steffen@t-online.de>
Merge branch 'Revive' of https://github.com/SteffenKrohn/Bugenbook

Conflicts:
	class/Content_Header.php