DBClass modified
DBClass modified
DBClass modified
Merge origin/master
Merge origin/master
Merge origin/master
Merge origin/master
Updated pager
Merge origin/master
Added Documentation
Added Documentation
Merge origin/master

Conflicts:
	news.php