fix for some javascript translations
Merge branch 'hotfixes'

Conflicts:
	admin/edit.php
Added a filter function
Some xss fixes

filtering $id reflection
Removed duplicate install.php from inc folder
fix for #497

xss fixes
dir traversal protection for ajax.php

This file will go away soon, but some protection for now.
removed dup
attempt to fix 3.0 upgrade issues.
untested
Merge branch 'hotfixes' of github.com:GetSimpleCMS/GetSimpleCMS into hotfixes
Merge branch 'hotfixes'

Conflicts:
	admin/edit.php
	admin/inc/common.php
	admin/inc/security_functions.php
fixes issue #528
version 3.2.1
fixes #530
fixes #534
fix for #525
fixes #533
Fixes Issue #536
Merge branch 'hotfixes'

Conflicts:
	admin/health-check.php
	admin/lang/en_US.php
feature #539 index-pretemplate hook before theme functions include