renamed classes folder to objects so that elgg doesn't try to load it automatically (which doesn't work)
Merge remote-tracking branch 'github/master'