Neu auf Basis der Webbaukasten-Struktur
Merge branch 'master' of https://github.com/RRZE-Webteam/Design-RRZE-Techfak2013

Conflicts:
	functions.php
	header.php
	inc/constants.php
	inc/custom-header.php