Fixed XSS
Merge branch 'i0wn'

Conflicts:
	inc/admin/content.php