Merge origin/master

Conflicts:
	poweryoga/src/main/java/com/saviour/poweryoga/serviceImpl/SemesterService.java
	poweryoga/src/main/webapp/views/admin/addSemester.xhtml
	poweryoga/src/main/webapp/views/customer/product.xhtml
	poweryoga/src/main/webapp/views/template/sections/navbar.xhtml