Merge branch 'master' of https://github.com/yunyusin/yogastudio

Conflicts:
	web/view/admin/manageCourse.xhtml
	web/view/admin/manageFaculty.xhtml
	web/view/admin/manageProduct.xhtml
	web/view/admin/manageSection.xhtml