Intermediate commit for Phil
Next commit for Phil
updated directories
Removed duplicate file
Merge remote-tracking branch 'origin/branch-rkgtech' into
latest-changes-merged-with-master

Conflicts:
	newmscwebsite/grails-app/controllers/newmscwebsite/HomeController.groovy
	newmscwebsite/grails-app/controllers/newmscwebsite/PersonController.groovy
	newmscwebsite/grails-app/controllers/newmscwebsite/ProductController.groovy
	newmscwebsite/grails-app/domain/newmscwebsite/Product.groovy
	newmscwebsite/grails-app/domain/newmscwebsite/ReportComment.groovy
	newmscwebsite/grails-app/domain/newmscwebsite/TrailReport.groovy
	newmscwebsite/grails-app/domain/newmscwebsite/TrailSection.groovy
	newmscwebsite/grails-app/domain/newmscwebsite/VolunteerSession.groovy
	newmscwebsite/grails-app/views/home/cartList.gsp
	newmscwebsite/grails-app/views/home/detailProduct.gsp
	newmscwebsite/grails-app/views/home/index.gsp
	newmscwebsite/grails-app/views/home/search.gsp
	newmscwebsite/grails-app/views/home/shoppingCart.gsp
	newmscwebsite/grails-app/views/layouts/_header.gsp
	newmscwebsite/grails-app/views/product/addProduct.gsp
	newmscwebsite/grails-app/views/product/editProduct.gsp
	newmscwebsite/grails-app/views/product/productList.gsp
	newmscwebsite/web-app/css/header.css
	newmscwebsite/web-app/js/header.js
	newmscwebsite/web-app/js/reportmap.js