#320 -- name of zip file wrong in 5 and 6
#328 adding a new parameter, now required for MLU queries
Merge branch 'docapp'

Conflicts:
	src/xray
removing xray...
... and adding xray back in, in the new location