Bug fixes for layout
Merge branch '1.1.7' of github.com:abantecart/abantecart-src into 1.1.7

Conflicts:
	public_html/admin/controller/responses/listing_grid/blocks_grid.php