ok
Merge remote-tracking branch 'origin/master'

Conflicts:

	TPCristecheGaiteroMontoya/TPEspecial2014/Modelo/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	TPCristecheGaiteroMontoya/TPEspecial2014/TPEspecial2014/obj/x86/Debug/TPEspecial2013.csproj.FileListAbsolute.txt

	TPESPECIAL2013-Romero-Nisenbaum/TPEspecial2013/Controladora/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	TPESPECIAL2013-Romero-Nisenbaum/TPEspecial2013/DAO/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	TPESPECIAL2013-Romero-Nisenbaum/TPEspecial2013/TPEspecial2013/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache