merge with lordjone/libgdx