Fix autoloading without composer update -o
Cleanup
Merge branch 'develop' into feature/vendor_free