Code in basic for ACL

Code in basic for ACL
code in acl

code in acl
code on group add

code on group add
basic coding

basic coding
Sales settings changes

Sales settings changes
Merge remote-tracking branch 'origin/mockup' into moc1.2_sales
basic code

basic code
basic coding

basic coding
basic coding

basic coding
Eexport functionality

Export functionality
Export common function

Export common function
Export functionality

Export functionality
Commit

Commit
Commit to merge

Commit to merge
Merge remote-tracking branch 'origin/moc1.2_sales' into 49.1-sales-campaign-type-sponsoring
Create sales campaign -general info

Create sales campaign -general info
add condition for partner id
added comment placeholder
update value for inactive
Merge remote-tracking branch 'origin/UAT' into UAT

Conflicts:
	application/models/marketing_model.php