Merge branch 'master' into gh-pages
Atualização das palestras
Merge branch 'master' into gh-pages

Conflicts:
	FrontInPOA2014/index.html
Ajustes Sintaxe
Merge branch 'gh-pages'