fixes #866
fixes #867
fixes #866
refix #623

better asset url setter, optional gsconfig option to disable
fixes #819
fixes #897
fixes #902
fixes #904 #903
Merge branch 'hotfixes'

Conflicts:
	admin/changedata.php
	admin/inc/basic.php
	admin/inc/caching_functions.php
	admin/inc/common.php
	admin/inc/plugin_functions.php
	admin/inc/template_functions.php
	admin/inc/theme_functions.php
	admin/template/error_checking.php
	temp.gsconfig.php
Merge branch 'master' into feature_896_fileio

Conflicts:
	admin/changedata.php
	admin/inc/template_functions.php