Single person mocked-up
Single person mocked-up
Merge branch 'origin/master'

Conflicts:
	wp-content/themes/teachnova/templates/content-person.php