Updated autoloader classmap
Merge branch 'develop'