Renaming to state_name
Moving to state_name
Merge branch 'master' into laura_and_will

Conflicts:
	app/serializers/api/address_serializer.rb
Default quantity to null rather than zero