Started working on internationalization.
Merge branch 'master' of https://github.com/jdpalmares/pizzaccio

Conflicts:
	WebContent/WEB-INF/content/pages/viewOrder.jsp
Added check all feature in view order
Started implementing Cancel Order Action
Merge branch 'master' of https://github.com/jdpalmares/pizzaccio

Conflicts:
	WebContent/WEB-INF/content/pages/viewOrder.jsp
Fixed merge errors in viewOrder.jsp
Merge branch 'master' of https://github.com/sethbusque/pizzaccio
Added:

	paymentForm.jsp

Edited:
	CancelOrderAction (made list private)
	PayOrderAction (implemented methods)
	OrderDao
	OrderService
	OrderServiceImpl (Added payment)
	viewOrder.jsp