#13 update order and fixed some tests enviroment
Merge branch 'master' of github.com:brtr/mvp

Conflicts:
	app/models/offer.rb
	db/seeds.rb