James
Merge branch 'master' of https://github.com/siloz/website

Conflicts:
	config_common.php