Fix canonical url 2
Fix image that doesn't appear at chrome 38 and firefox
Fix merge