Resolve merge conflicts
Merge branch 'master'

Conflicts:
	category.php
	includes.php
	index.php
	vars/site.php