Merge branch 'origin/PAPparser'
Change returning cmp insted of cmpId.

This change will simplify taking data, which are needed with adding companies to DB.