Updated CHANGELOG
Fixed: Layout issues
Merge branch '1.1.x' into develop

Conflicts:
	CHANGELOG
	gui/themes/default/shared/partials/forms/hosting_plan_edit.tpl