responsiveness
Merge remote-tracking branch 'origin/master'

Conflicts:
	public_html/adminbox.php