Simple display controller and display
Merge branch 'master' of github.com:linnet/DisplayController