Inicio do Merge
Merge branch 'master' of https://github.com/guipimenta/USPeriodico

Conflicts:
	USPeriodico/USPeriodico.csproj