fixing layout
Merge branch 'develop' of https://github.com/golvmopp/BGSEP into develop

Conflicts:
	VirtualGamepad/res/layout/activity_nes.xml
	VirtualGamepad/src/bgsep/virtualgamepad/NesActivity.java
fixed Y-position of A-button and B-button