changes to reflect nested attributes in user form
 Updated with nested attributes...needs additional edits
completed nested forms, but the coupon paramters are not allowed
Merge branch 'master' into coupon_jeff_branch
it sucks
Conflicts:
	db/schema.rb
merging in jeffs stuff