agrego parte de facturacion
Merge branch 'master' of https://github.com/roli93/gdd-hoteles-2014-2c

Conflicts:
	FrbaHotel/FrbaHotel/Program.cs
Merge branch 'master' of https://github.com/roli93/gdd-hoteles-2014-2c

Conflicts:
	Migracion/Script_Creacion_Inicial.sql
merge