Associating people with users among other things
Merge branch 'master' of github.com:ttimsmith/orange-bear

Conflicts:
	app/admin/person.rb