config
Merge branch 'master' into experiments

Conflicts:
	config.php
	index.php
finalized
Merge branch 'experiments'
sahi