Updated dev
Merge branch 'develop' into staging
Hopefully last update before HW6