CLOUD-189 removed company, added account
CLOUD-189  fixed tests
Merge pull request #264 from sequenceiq/account-refactor

lgtm