Xperia buttons
Fix to a merge error
Merge pull request #232 from Lobomon/mariano-editor-support

Xperia buttons
Xperia buttons full

Conflicts:
	builds/android/src/org/easyrpg/player/EasyRpgPlayerActivity.java