re integrating facebook comments to articles
Merge branch 'master' into comment_articles

Conflicts:
	.gitignore
Merge pull request #4 from yiendos/comment_articles

Comment articles