Halp
Merge remote-tracking branch 'upstream/master'

Conflicts:
	gdx-vr-android/build.gradle
Merge pull request #1 from Tom-Ski/master

Halp