Order and Update Customer Revised
Order and Update Customer Revised
Merge origin/master

Conflicts:
	poweryoga/src/main/webapp/views/template/sections/navbar.xhtml