Estetyka kodu modeli.
Merge branch 'master' into pablo

Conflicts:
	app/models/order.rb
	app/models/user.rb
Merge branch 'master' into pablo