no message
Merge branch 'master' of https://github.com/c4ll-m3-j4ck/loewsalzmann

Conflicts:
	Resources/Private/Templates/teaser.php