Merge branch 'Gameplay_Refactor' of https://github.com/eugene195/tp_2014_09_java into Gameplay_Refactor
Hotfix for buttons
Buttons not working
Merge branch 'master' of https://github.com/eugene195/tp_2014_09_java into Gameplay_Refactor
Layout corrected
Merge branch 'Gameplay_Refactor' of https://github.com/eugene195/tp_2014_09_java into Gameplay_Refactor
Merge branch 'Gameplay_Refactor'