Use stub_model rathen than mock_model

Make rails 4.0.4 build happy

Conflicts:
	core/spec/models/spree/promotion_spec.rb
Save Asset rather than touch

spree_assets doesnt have timestamps fields and as of rails 4.0.4 it wont
touch associations anymore for models that dont have timestamps fields