Merge develop from syddjurs legacy os2web repo.
Change from allowing from ip/host to just enable/disable on site basis.