Merge pull request #42 from alexivanov84/branch#9

social
Merge pull request #43 from alexivanov84/branch#9

social
Cleanup the code
social templates