Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjetoAcademia/Controllers/AdministradorGeralController.cs
	ProjetoAcademia/ProjetoAcademia.csproj
	ProjetoAcademia/bin/ProjetoAcademia.dll
	ProjetoAcademia/bin/ProjetoAcademia.pdb

	ProjetoAcademia/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ProjetoAcademia/obj/Debug/ProjetoAcademia.csproj.FileListAbsolute.txt

	ProjetoAcademia/obj/Debug/ProjetoAcademia.csprojResolveAssemblyReference.cache
	ProjetoAcademia/obj/Debug/ProjetoAcademia.dll
	ProjetoAcademia/obj/Debug/ProjetoAcademia.pdb