Merge pull request #47 from p1tz/master

merge
Merge pull request #50 from p1tz/master

merge
revert portal_normal template to nearly original