Facebook like
Merge branch 'master' into elDorado
facebook sdk y like button
Merge branch 'elDorado'
Merge branch 'master' into gh-pages