added attachment and inlineattachment to message_delivery.rb
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/mailjet/resources/listrecipient.rb