Merge branch 'dev' of https://github.com/silentguardian/SimplePortal

Conflicts:
	Sources/PortalAdminArticles.php
	Sources/PortalArticles.php
	Sources/PortalCategories.php