Update Branch Master from joomlapro/joomla3-scaffold