edited gitignore
Merge branch 'stable' of github.com:GetSimpleCMS/GetSimpleCMS into stable
gitignore fix
Merge branch 'hotfixes' into stable

Conflicts:
	.gitignore
Merge branch 'hotfixes' into stable
Merge branch 'hotfixes' into stable
Merge branch 'hotfixes' into stable
Merge branch 'hotfixes' into stable
Merge branch 'hotfixes' into stable
Merge branch 'hotfixes' into stable
Merge branch 'hotfixes' into stable
Revert "fixes #548"

This reverts commit 579d0d01d6178d6483d6c80da8274921590f4a5d.
b3
Merge branch 'hotfixes' into stable

Conflicts:
	admin/upload.php
v3.2.2
v3.2.3b1
Changed all the remaining functions to use caching
Added file exists check for sitemap.xml
refactored updateSlugs to use cache information
removing debug code
fixes #603

Not using pagecache for parent select