v3.3.3b
fixes #623
fixes #818
fixes  #818

handle errors
fixes #805 and #281
fixes #805 and #281
re factored this a bit to make it extensible and reusable,.
#805 typos
fixes #825
fixes #821
3.3.3 beta
Merge branch 'hotfixes'

Conflicts:
	admin/inc/basic.php
	admin/inc/configuration.php
	admin/inc/plugin_functions.php
	admin/setup.php
	admin/template/header.php
	admin/upload.php
Merge branch 'master' of github.com:GetSimpleCMS/GetSimpleCMS