Merge branch 'develop'
Fixed classes autoload with namespaces
Merge branch 'master' into develop