MAJOR CHANGE to location of demos support files, please test!
Merge branch 'develop' of https://github.com/tipam/pi3d into develop