Merge branch 'dev' into feature/bootstrap

Conflicts:
app/models/auction.rb
Fixes/enhancements of previous merge.