prevent Wordpress from guessing URLs instead of 404
Merge branch 'no-url-guessing' into prod
Merge branch 'prod' into v2

Conflicts:
	functions.php