Changing component router to retrieve, since the com_content router is pretty complex and throws errors in our testing environment
Merge branch 'componentrulesitemid' of github.com:Hackwar/joomla-cms into com_content_router_legacy
Merge branch 'com_content_router_legacy' of github.com:Hackwar/joomla-cms into com_content_router_legacy