Merge pull request #73 from NoblesseOblige/master

Clean up the options call when moving to the main activity
First steps to integrate multi-controller support
Add an ignore for orig files to prevent saved merge backups
Added configuration GUI for physical controllers

Reverted changes in maple_cfg.cpp except a minor memory leak
Fixed an issue with the Xbox 360 controller support, that the first
press of the DPAD would not get handled
Lots of improvments on multi-controller support
Added multi-controller support into MOGA implementation (Untested! Somebody with MOGA hardware should verify that I didn't break anything!)
Fixed OSD hiding for multiple controllers (OSD is now hidden only in case Player 1 is using a physical controller)
Fixed PS3 controller mapping (regression?)