Merge pull request #145 from nsendetzky/master

Fixes handling of {site} place holder for admin interface