add new server variables
merge staging into mporam
Merge branch 'staging' into develop

Conflicts:
	demo/css/core.less
	demo/css/global.less
	demo/index.php