small code formatting
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/Lot.scala
	app/models/Position.scala
small code formatting