fixed merge conflicts
Merge pull request #112 from JessicaG/order_options_save

Order options save
Revert "Order options save"
Merge pull request #115 from JessicaG/revert-112-order_options_save

Revert "Order options save"
merge conflicts
Merge pull request #117 from JessicaG/order_options

Order options
fixed merge conflicts
Merge branch 'master' into dup_require_one_business_admin

merging with master
Merge pull request #120 from JessicaG/dup_require_one_business_admin

Dup require one business admin