Merge origin/master

Conflicts:
	poweryoga/src/main/java/com/saviour/poweryoga/controller/FacultyController.java
	poweryoga/src/main/java/com/saviour/poweryoga/model/Section.java
	poweryoga/src/main/java/com/saviour/poweryoga/serviceI/ISectionService.java
	poweryoga/src/main/java/com/saviour/poweryoga/serviceImpl/FacultyService.java
	poweryoga/src/main/java/com/saviour/poweryoga/serviceImpl/ProductService.java
	poweryoga/src/main/java/com/saviour/poweryoga/serviceImpl/SectionService.java
	poweryoga/src/main/webapp/views/admin/editSection.xhtml
Merge origin/master