Dropping "page" adding it to the right function.
Merge branch 'develop'
Fixing a parse errrrrr
Merge branch 'develop' of https://github.com/Make-Magazine/makeblog into develop

Conflicts:
	includes/search/search.php