Merge branch 'master' into 'master'

Changed ghost location from location to prophecy variable

See merge request iris/examples!24