Merge branch 'master' of /home/marc/Workspace/WYLION with conflicts.
Working on UI - Testing various designs