Changes based on Bugs
Merge origin/master

Conflicts:
	poweryoga/src/main/webapp/views/customer/customerAddress.xhtml