Submissão e Noticias
Merge branch 'master' of https://github.com/PETComputacaoUFCG/SiteENEPET2014

Conflicts:
	docs/html/noticias/index.html
	docs/html/noticias/noticia1.html
	docs/html/noticias/noticia2.html
	docs/html/submissao/index.html
Atualizando Noticias