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.
added curl header to curl debug
fixes #356
Merge branch 'hotfixes' of github.com:GetSimpleCMS/GetSimpleCMS into hotfixes
fixes #559
disable curl debugging
fixes #584

this will prevent the terrible html formatting in ck3
fixes #585

Moved genStdThumb function, refactored uploadify and upload to use the
same function. cleaned up some extra crap that was going on for no
reason.
fixes #316

Replaced thumbnail creation infinite memory limit to 100M to prevent
susohin alerts and avoid massive memory issues.