Merge pull request #2384 from swilla/2.3/develop

Keywords Refactor for PSR-0 Autoload and some PSR-2 changes
Merge remote-tracking branch 'upstream/2.3/develop' into filesrefactor
Progress on conversion
Dirty hack to get places listing tree working