Merge
Merge branch 'master' of https://github.com/penouille/Stratego-ucl.git
Merging end (without View)