Merge branch 'release/1.5.2' into development
Merge branch 'hotfix/1.5.2.1' into development
bump version, fixed some weird merge issues
Merge remote-tracking branch 'origin/development'

Hopefully getting all the branches on track and together