upd
Merge branch 'master' of https://github.com/egemenulucay/TichToch-Friendship

Conflicts:
	FriendShip/MainPage.aspx