Merge pull request #150 from cjemagid/3.0

merged andrew's work
fixed pagination
Merge branch '3.0' of github.com:SkyPHP/cms into 3.0

Conflicts:
	lib/class/class.pagination.php