fixed nested forms
fixed conflicts wit merging master
Fixed a number of broken items and added small featutes
Merge pull request #18 from piklowry/coupon_jeff_branch

Coupon jeff branch