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.
Merge branch 'hotfixes' into stable

Conflicts:
	admin/upload.php
v3.2.2
fix php error

Notice: Undefined index: googleplus ect on /InnovationPlugin.php on line
75
- Hatchet
fixes #626
fixes #626 fo reals
v3.2.3
Merge branch 'hotfixes' into develop

Conflicts:
	admin/edit.php
	admin/inc/configuration.php