closes #278 although testing hasn't occurred
Merge branch 'master' of https://github.com/notionparallax/ShadowWolf into feature-278

Conflicts:
	client/app/views/people/index.html
okay, really closed #278 this time