Live server clean-up
Merge branch 'master' of https://github.com/joeflintham/dfs

Conflicts:
	api/config.php