Merge branch 'master' into laura_and_will

Conflicts:
	app/serializers/api/address_serializer.rb

app/serializers/api/address_serializer.rb

@@ -1,10 +1,12 @@
 class Api::AddressSerializer < ActiveModel::Serializer
-  cached
-  delegate :cache_key, to: :object
+  #cached
+  #delegate :cache_key, to: :object
 
-  attributes :id, :zipcode, :city, :state, :state_id 
+  attributes :id, :zipcode, :city, :state_name, :state_id,
+    :phone, :firstname, :lastname, :address1, :address2, :city, :country_id,
+    :zipcode
 
-  def state
+  def state_name
     object.state.andand.abbr
   end
 end