Very small changes
Merge remote-tracking branch 'origin/master' into Klim
Change to landscape works
Small changes
Merge remote-tracking branch 'origin/master' into Klim
Merge remote-tracking branch 'origin/master' into Klim
Changed GUI
Changed GUI
Merge remote-tracking branch 'origin/master' into Klim
Change GUI for PictoAdmin
Merge remote-tracking branch 'origin/master' into Klim

Conflicts:
	Source/workspace/OasisApp/gen/.gitignore
Merge branch 'Lisbeth'