fixed typo
Merge pull request #149 from drummer3333/master

fixed typo
Update main.tpl
Update User.php
Update User.php
Merge pull request #150 from Guite/master

Fixed view filtered by category
Allow page lists filter by sub categories
Fixed non-working page permissions with short urls
Readded dropped code
Merge branch 'master' of https://github.com/zikula-modules/Content into guite