Make template fix multi-site compatible, fix short tags
Merge pull request #92 from 9seeds/master

Make template fix multi-site compatible, fix short tags