Added fixes for company address
Merge branch 'auction_fixes'