Merge origin/Phase-II-Sales-Implementation into Phase-II-Sales-Implementation

Conflicts:
	src/main/webapp/confirmSale.xhtml
Merge origin/Phase-II-Sales-Implementation into Phase-II-Sales-Implementation
Merge origin/Phase-II-Sales-Implementation into Phase-II-Sales-Implementation
Merge origin/Phase-II-Sales-Implementation into Phase-II-Sales-Implementation

Conflicts:
	src/main/webapp/confirmSale.xhtml
Merge origin/Phase-II-Sales-Implementation into Phase-II-Sales-Implementation
cancelacion de ventas
Conflicts:
	src/main/java/com/simphony/repositories/SaleRepository.java