Starting to change for optimisation
Merge branch 'dev' of https://github.com/eXpansionPluginPack/eXpansion into dev

Conflicts:
	Gui/Elements/OptimizedPager.php