Gitignore /gen
Merge commit 'b885381bf8bfd468ccdcc2283455777a3aff011b' into android
Merge commit '3a82496564979e1679e7c811cc246cc6ead45b2f' into android-gdx