Added payment methods
Rate datatype changed
marketing campaign bug fixing
conflict resolved
Merge branch 'UAT' of https://github.com/subodh4codaemon/redlemon into UAT

Conflicts:
	application/controllers/marketing_campaigns.php
	application/models/marketing_model.php