Fix merge bug (master to another branch)
Fix canvas size for all orientations
Prepare delete feature calculation
Merge branch 'feature/size-refactor' into develop