added billing
Merge branch 'WAP' of ssh://git@github.com/murali-kiran/CMS into WAP
resolved conficts
Conflicts:
	src/main/java/com/sumadga/wap/billing/BillingController.java
	src/main/java/com/sumadga/wap/billing/BillingUtils.java
Merge branch 'WAP' of ssh://git@github.com/murali-kiran/CMS into WAP
modified