Template for friends list is ready
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/cards.html
Template for friends list is ready