Merge pull request #219 from goranche/master

changed name to property in meta tags for FB
Added ifs for image tags...
Merge pull request #221 from goranche/master

Added ifs for image tags and changed "name" to "property" for FB tags
Merge remote-tracking branch 'upstream/master' into deployment