Xperia play buttons 2
Merge branch 'mariano-editor-support' of https://github.com/Lobomon/Player into mariano-editor-support

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