added Joomla console, updated amp/git scan, modified joomla install scripts
fixed merged conflicts