change data type users.company_id again
Merge branch 'staging' of https://github.com/sankai/r2system into sankai-staging

Conflicts:
	db/schema.rb