added realignment with button design
Merge commit '374d8b52ddf5657f8ea92f2d0f3f0594c6c5e6b2'
add friend progress
Merge commit 'a52ffb354dd4ee5b6c5210d6453aab122fb1b533'

Conflicts:
	templates/person.html