Test
Merge branch 'master' of https://github.com/OxiStudios/ThisOrThat

Conflicts:

ThisOrThat-html/war/WEB-INF/classes/com/OxiStudios/ThisOrThat/client/Gwt
Launcher.class