change assoiciation to show order user name and company
Merge branch 'master' of https://github.com/songxyu/BidGate-Shangri-la

Conflicts:
	app/models/user.rb