Merge pull request #16 from alfeko/mattsonbranch

Mattsonbranch
k
Merge pull request #17 from alfeko/mattsonbranch

Mattsonbranch
Merge pull request #18 from alfeko/master

ui update
Edit company method
Merge pull request #21 from alfeko/alexbranch

Alexbranch
Fixed branch
Merge pull request #24 from alfeko/master

Updated with master