debugging info
Merge branch 'mergeLocation' of https://github.com/wukong-m2m/wukong-darjeeling into mergeLocation

Conflicts:
	wukong/master/mock_discovery.xml