ignore swo
Merge branch 'develop' into feature/solutions