edited copy
Merge branches 'master' and 'master' of https://github.com/superphly/tm

Conflicts:
	archive-person.php