Merge branch 'master' of https://github.com/goorum/ePubIntegrator

Conflicts:

	Trabalho/ePubIntegratorSolution/ePubIntegratorClient/bin/Debug/config.xml

	Trabalho/ePubIntegratorSolution/ePubIntegratorClient/bin/Debug/ePubIntegratorClient.exe

	Trabalho/ePubIntegratorSolution/ePubIntegratorClient/bin/Debug/ePubIntegratorClient.pdb

	Trabalho/ePubIntegratorSolution/ePubIntegratorClient/obj/Debug/ePubIntegratorClient.ClientForm.resources

	Trabalho/ePubIntegratorSolution/ePubIntegratorClient/obj/Debug/ePubIntegratorClient.csproj.GenerateResource.Cache

	Trabalho/ePubIntegratorSolution/ePubIntegratorClient/obj/Debug/ePubIntegratorClient.exe

	Trabalho/ePubIntegratorSolution/ePubIntegratorClient/obj/Debug/ePubIntegratorClient.pdb
	Trabalho/ePubIntegratorSolution/ePubIntegratorSolution.v11.suo