stuff i forgot
Merge remote-tracking branch 'origin/master'

Conflicts:
	Trabalho/ePubIntegratorSolution/ePubIntegratorSolution.v11.suo