Merge branch '3.0' of https://github.com/cjemagid/cms into 3.0
Merge branch '3.0' of https://github.com/SkyPHP/cms into 3.0
fix bestnewyears.com
Merge branch '3.0' of https://github.com/SkyPHP/cms into 3.0

Conflicts:
	pages/seo.php
Merge pull request #148 from linab/3.0

3.0