Merge branch 'coltons-branch'
Merge branch 'coltons-branch'
Add sub_campaign as hidden field to form
Update affiliate_id to default 0
Add gitignore and update minified statler.js
Merge branch 'master' into coltons-branch