Templates modified.
Templates modified.
Merge origin/master

Conflicts:
	poweryoga/src/main/webapp/views/admin/adminHome.xhtml