Test commit.
Undo test commit
Test commit.
Committing
Merge branch 'master' of https://github.com/pypt/mediacloud

Conflicts:
	spider_config.xml