Weird message
Worked on controls
Merge branch 'master' of https://github.com/blaavogn/platform4