changes commited before merge
Merge branch 'master' of https://github.com/doddi/displayserver
Producing a functioning view including basic cananalyser