upd
upd
Merge branch 'master' of https://github.com/egemenulucay/friendship

Conflicts:
	friendship.v11.suo