Merge pull request #38 from alexivanov84/branch#9

Branch#9
Merge pull request #39 from alexivanov84/branch#9

Branch#9
Merge origin/master

Conflicts:
	system/protected/components/social/SocialOutlet.php
social