Something Controller MVC GUI something somethin....
Merge branch 'master' into sophie