Fix campaign issue for beta

fixed up the issue
Model issue fix in template

Model issue fixed in template.js
Target issue fixed for step 1

Target issue fixed for Step1
Merge branch 'abdullah_6.31' into _MEE