confilict?
Merge branch 'unityEdBranch' of https://github.com/dominikkrejcik/smartscarf into unityEdBranch