changed composer autoloading to classmap
Merge remote-tracking branch 'origin/master'