to discard
Merge branch 'master' of https://github.com/PPedroso/SD_1314

Conflicts:
	Serie1/SD_Serie1/Client/JobManager.cs