mycom
Merge remote-tracking branch 'origin/master'

Conflicts:
	AventuraInvestigativo/AventuraInvestigativo-csharp.sln
	AventuraInvestigativo/AventuraInvestigativo.sln