cleaning up code after patches/changes
Merge branch 'develop' of https://github.com/CulturePlex/Sylva into develop