Random changes
Merge branch 'master' of https://github.com/orangedog22/dealfish

Conflicts:
	Resources/company/company.js
	Resources/company/ui.js