Add Facebook Like to article page
Merge branch 'master' into myanmar

Conflicts:
	templates/article.html