merge location tree UI
merge master_server.py
Merge branch 'merge-features' of https://github.com/wukong-m2m/wukong-darjeeling into mergeLocation

Conflicts:
	wukong/master/master_server.py
	wukong/master/static/js/application.js
minor bug fix
Merge branch 'merge-features' of https://github.com/wukong-m2m/wukong-darjeeling into mergeLocation
simulation mode for offline testing
mock location during discovery
fix Node definition doesn't mactch locationtree usage
bug fix. enable_pretty_logging not available in tornado.options
bug fix
rename bug
update mock_discovery
Merge branch 'mergeLocation' into merge-features