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

Conflicts:
	src/main/java/com/simphony/managedbeans/SaleBean.java
	src/main/webapp/cambioConfirm.xhtml
	src/main/webapp/sale.xhtml