Added UD to NFS example... will break under HS example
resolve merge conflicts

Merge branch 'master' of https://github.com/NMML/crawl_toolbox

Conflicts:
	server.R
pull remaining updates from origin/master