Compra
Merge branch 'master' of https://github.com/maxiruani/TP-GDD-1C-2013

Conflicts:
	FrbaBus/FrbaBus.csproj
	Logic/Logic.csproj
	Logic/PasajesLogic.cs
	Logic/PersonasLogic.cs