Merge pull request #1573 from seanpaultaylor/next

Next
Finished Android gamepad support