datatable issue
Merge remote-tracking branch 'origin/36.0basic-coding-acl' into UAT

Conflicts:
	nbproject/private/private.xml
show page info
Merge remote-tracking branch 'origin/UAT' into 49.1-sales-campaign-type-sponsoring
Sponsoring type

Sponsoring type
Sponsoring type

Sponsoring type
Sponsoring campaign

Sponsoring campaign
Error removed
Merge remote-tracking branch 'origin/UAT' into 92.1-sweepstakes-manage
mergged with UAT
Merge branch '92.1-sweepstakes-manage' of https://github.com/subodh4codaemon/redlemon into 92.1-sweepstakes-manage
Added payment methods
create sweepstake
Coreg and sponsoring

Coreg and sponsoring
Rate datatype changed
Coreg campaign answers

Coreg campaign answers
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
conflict resolved