friends trees + statistics
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/migrate/20140606130108_create_links.rb