Fixed getX() and getY() in Tile.java to getxPos(), to avoid conflicting with the superclass of Tile.java, again
Merge remote-tracking branch 'origin/master'
Added GameActivity and made it accesable from MainActivity.