Adding a nice little JSON/controller test
Making our form on_demand and count_on_hand aware
Patching a bug in shop controller