#36 used term_id
Merge branch '36-allow-category' into 51-no-post/pages

Conflicts:
	virtualpages-with-templates.php