,
Merge branch 'masterT' of https://github.com/TonySniper/ProjetoPap2013 into masterT

Conflicts:
	ProjetoPap.Web/Controllers/CarrinhoController.cs
	ProjetoPap.Web/ProjetoPap.Web.csproj
	ProjetoPap.Web/Views/Carrinho/ComprarComCartao.cshtml