Merge pull request #2 from Monroe88/master

Pull commits from upstream
Add alternate 6 button mapping
Merge pull request #4 from fr500/master

Add alternate 6 button mapping
Merge https://github.com/ekeeke/Genesis-Plus-GX

Conflicts:
	libretro/libretro.c
Merge pull request #6 from Oggom/master

Pull latest changes
Merge https://github.com/ekeeke/Genesis-Plus-GX
Update libretro.h
Merge pull request #8 from Oggom/master

Pull latest changes
Merge https://github.com/ekeeke/Genesis-Plus-GX
(Android) Build fix
Merge pull request #9 from lordashram/master

(Android) Build fix
Update Makefile
Merge pull request #10 from Oggom/master

Pull latest changes
[Core/MD] improved console region auto-detection for a few PAL-only games (The Smurfs Travel the World & Williams Arcade's Greatest Hits)
Merge https://github.com/ekeeke/Genesis-Plus-GX
Add Makefile.common - used for both Android JNI Makefile and regular
libretro Makefile
Merge pull request #37 from libretro/master

Libretro updates