add friend progress
Merge commit 'a52ffb354dd4ee5b6c5210d6453aab122fb1b533'

Conflicts:
	templates/person.html