Merge origin/master

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