Merge branches 'dev' and 'dev' of https://github.com/duduBaiao/senac-games-2014 into dev