Merge branch 'master' into marty
Merge branch 'master' into marty
Merge branch 'master' into marty
Added misc accessories back in, added wait spinner when creating customer, fixed accessory selections, cleaned up alert messages for network unavailable errors
Merge branch 'marty'