Added option to disable iFrame protection
Fixed expire column sorting
Merge branch 'master' of https://github.com/confuser/Ban-Management

Conflicts:
	banmanagement/updatesettings.php