Merge branch 'feature-appstore-server' of https://github.com/joomla-projects/joomla-cms into feature-appstore-server
Merge branch 'feature-appstore-server' of https://github.com/joomla-projects/joomla-cms into feature-appstore-server
CSS + JS files unified, category regression fixed
Merge pull request #187 from emavro/feature-appstore-server

CSS + JS files unified, category regression fixed