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

Conflicts:
	web/view/admin_home.xhtml