remove admin_tool as a category
Merge pull request #3713 from rajatchopra/master

Merged by openshift-bot
Merge remote-tracking branch 'origin/master' into origin_ui_72_membership

Conflicts:
	cartridges/openshift-origin-cartridge-phpmyadmin/metadata/manifest.yml.f19
	cartridges/openshift-origin-cartridge-phpmyadmin/metadata/manifest.yml.rhel