upgrading url, not supports mapping
..
Merge branch 'master' of https://github.com/mhrisse/lotus

Conflicts:
	config.json