remove conflict
merge sivanand with master
service module implement calculation
#222 product/service additional charge functionality
Merge pull request #239 from vaibhavcisin274/vaibhav

service module implement calculation
change in application css
Merge pull request #240 from vaibhavcisin274/vaibhav

change in application css
change inbootstrap
Merge pull request #241 from vaibhavcisin274/vaibhav

change inbootstrap
show 3 times
enhance product module