Fixing conflits
Merge branch 'gh-pages' of github.com:thiagokimo/fmtm into gh-pages
Adding next event url