Prevent reloading loop
Category expansibility restored
Merge branch 'feature-appstore-server' of https://github.com/joomla-projects/joomla-cms into feature-appstore-server

Conflicts:
	jedapps/js/client.js
Merge pull request #154 from emavro/feature-appstore-server

Prevent reloading loop