grim/guifications2

Noticed that I forgot to get the x11 and win32 specific display files into the cmake build, so moved them into src/ and added them depending on the target
[branchname]
master = default
develop = develop
feature = feature/
release = release/
hotfix = hotfix/
support = support/