small fixes
fixed merge conflict
Merge branch 'Oskar'
Moved anchor points to be in center of components
Merging
Merge branch 'master' into Oskar